Minor perf optimizations

muratcakir · muratcakir · commit bb6948879fb6 · 2014-04-30T21:38:39.000+02:00
diff --git a/src/Libraries/SmartStore.Core/IO/MimeTypes.cs b/src/Libraries/SmartStore.Core/IO/MimeTypes.cs
@@ -31,9 +31,11 @@ public static string MapMimeTypeToExtension(string mimeType)
 
             try
             {
-                var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + mimeType, false);
-                object value = key != null ? key.GetValue("Extension", null) : null;
-                result = value != null ? value.ToString().Trim('.') : null;
+				using (var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + mimeType, false))
+				{
+					object value = key != null ? key.GetValue("Extension", null) : null;
+					result = value != null ? value.ToString().Trim('.') : null;
+				}
             }
             catch (SecurityException)
             {
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs b/src/Libraries/SmartStore.Core/Infrastructure/ComparableObject.cs
@@ -160,7 +160,7 @@ protected virtual IEnumerable<PropertyInfo> GetSignaturePropertiesCore()
             var properties = t.GetProperties()
                             .Where(p => Attribute.IsDefined(p, typeof(ObjectSignatureAttribute), true));
 
-            return properties.Union(_extraSignatureProperties);
+            return properties.Union(_extraSignatureProperties).ToList();
         }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Services/Common/KeepAliveTask.cs b/src/Libraries/SmartStore.Services/Common/KeepAliveTask.cs
@@ -15,9 +15,7 @@ public KeepAliveTask(IStoreContext storeContext)
         {
 			this._storeContext = storeContext;
         }
-        /// <summary>
-        /// Executes a task
-        /// </summary>
+
         public void Execute()
         {
 			var storeUrl = _storeContext.CurrentStore.Url.TrimEnd('\\').EnsureEndsWith("/");
diff --git a/src/Presentation/SmartStore.Web.Framework/Themes/DefaultThemeRegistry.cs b/src/Presentation/SmartStore.Web.Framework/Themes/DefaultThemeRegistry.cs
@@ -19,15 +19,18 @@
 
 namespace SmartStore.Web.Framework.Themes
 {
-    public partial class DefaultThemeRegistry : IThemeRegistry
+    public partial class DefaultThemeRegistry : DisposableObject, IThemeRegistry
     {
 		#region Fields
 
 		internal const string THEME_MANIFESTS_ALL_KEY = "sm.theme-manifests.all";
 
 		private readonly SmartStoreConfig _cfg;
 		private readonly IEventPublisher _eventPublisher;
-		private readonly ConcurrentDictionary<string, ThemeManifest> _themes = new ConcurrentDictionary<string,ThemeManifest>(StringComparer.InvariantCultureIgnoreCase);
+		private readonly ConcurrentDictionary<string, ThemeManifest> _themes = new ConcurrentDictionary<string, ThemeManifest>(StringComparer.InvariantCultureIgnoreCase);
+
+		private FileSystemWatcher _watcherCfg;
+		private FileSystemWatcher _watcherFolders;
 
 		#endregion
 
@@ -54,32 +57,32 @@ public DefaultThemeRegistry(
 
 		private void WatchConfigFiles()
 		{
-			var watcher = new FileSystemWatcher();
-
-			watcher.Path = CommonHelper.MapPath(_cfg.ThemeBasePath);
-			watcher.Filter = "theme.config";
-			watcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName;
-			watcher.IncludeSubdirectories = true;
-			watcher.EnableRaisingEvents = true;
-
-			watcher.Changed += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
-			watcher.Deleted += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
-			watcher.Created += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
-			watcher.Renamed += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
+			_watcherCfg = new FileSystemWatcher();
+
+			_watcherCfg.Path = CommonHelper.MapPath(_cfg.ThemeBasePath);
+			_watcherCfg.Filter = "theme.config";
+			_watcherCfg.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName;
+			_watcherCfg.IncludeSubdirectories = true;
+			_watcherCfg.EnableRaisingEvents = true;
+
+			_watcherCfg.Changed += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
+			_watcherCfg.Deleted += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
+			_watcherCfg.Created += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
+			_watcherCfg.Renamed += (s, e) => ThemeConfigChanged(e.Name, e.FullPath);
 		}
 
 		private void WatchFolders()
 		{
-			var watcher = new FileSystemWatcher();
+			_watcherFolders = new FileSystemWatcher();
 
-			watcher.Path = CommonHelper.MapPath(_cfg.ThemeBasePath);
-			watcher.Filter = "*";
-			watcher.NotifyFilter = NotifyFilters.DirectoryName;
-			watcher.IncludeSubdirectories = false;
-			watcher.EnableRaisingEvents = true;
+			_watcherFolders.Path = CommonHelper.MapPath(_cfg.ThemeBasePath);
+			_watcherFolders.Filter = "*";
+			_watcherFolders.NotifyFilter = NotifyFilters.DirectoryName;
+			_watcherFolders.IncludeSubdirectories = false;
+			_watcherFolders.EnableRaisingEvents = true;
 
-			watcher.Renamed += (s, e) => ThemeFolderRenamed(e.Name, e.FullPath, e.OldName, e.OldFullPath);
-			watcher.Deleted += (s, e) => TryRemoveManifest(e.Name);
+			_watcherFolders.Renamed += (s, e) => ThemeFolderRenamed(e.Name, e.FullPath, e.OldName, e.OldFullPath);
+			_watcherFolders.Deleted += (s, e) => TryRemoveManifest(e.Name);
 		}
 
 		private void ThemeConfigChanged(string name, string fullPath)
@@ -195,6 +198,18 @@ private void LoadThemes()
 
         #endregion
 
+
+		protected override void OnDispose(bool disposing)
+		{
+			if (disposing)
+			{
+				_watcherCfg.Dispose();
+				_watcherFolders.Dispose();
+
+				_watcherCfg = null;
+				_watcherFolders = null;
+			}
+		}
 	}
 
 }
diff --git a/src/Presentation/SmartStore.Web.Framework/Themes/ThemeVarsVirtualFile.cs b/src/Presentation/SmartStore.Web.Framework/Themes/ThemeVarsVirtualFile.cs
@@ -40,11 +40,14 @@ public override Stream Open()
         private Stream GenerateStreamFromString(string value)
         {
             var stream = new MemoryStream();
-            var writer = new StreamWriter(stream, Encoding.Unicode);
-            writer.Write(value);
-            writer.Flush();
-            stream.Seek(0, SeekOrigin.Begin);
-            return stream;
+
+			using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true))
+			{
+				writer.Write(value);
+				writer.Flush();
+				stream.Seek(0, SeekOrigin.Begin);
+				return stream;
+			}
         }
 
     }
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs
@@ -73,10 +73,13 @@ public void Render()
         public string ToHtmlString()
         {
             string str;
-            using (StringWriter stringWriter = new StringWriter())
+            using (var stringWriter = new StringWriter())
             {
-                this.WriteHtml(new HtmlTextWriter(stringWriter));
-                str = stringWriter.ToString();
+				using (var htmlWriter = new HtmlTextWriter(stringWriter))
+				{
+					this.WriteHtml(htmlWriter);
+					str = stringWriter.ToString();
+				}
             }
             return str;
         }
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Presentation/SmartStore.Web/Infrastructure/Cache/ModelCacheEventConsumer.cs
@@ -247,14 +247,22 @@ public partial class ModelCacheEventConsumer:
         /// Key for TopicWidget caching
         /// </summary>
         /// <remarks>
-        /// {0} : widget zone
-        /// {1} : store id
-        /// {2} : language id
+        /// {0} : store id
+        /// {1} : language id
         /// </remarks>
-        public const string TOPIC_WIDGET_PATTERN_KEY        = "sm.pres.topic.widget";
-        public const string TOPIC_WIDGET_ALL_MODEL_KEY      = "sm.pres.topic.widget-all-{0}";
-        public const string TOPIC_WIDGET_BYZONE_PATTERN_KEY = "sm.pres.topic.widget-byzone";
-        public const string TOPIC_WIDGET_BYZONE_MODEL_KEY   = "sm.pres.topic.widget-byzone-{0}-{1}-{2}";
+        public const string TOPIC_WIDGET_PATTERN_KEY = "sm.pres.topic.widget";
+        public const string TOPIC_WIDGET_ALL_MODEL_KEY = "sm.pres.topic.widget-all-{0}-{1}";
+
+		/// <summary>
+		/// Key for TopicWidget by zone caching
+		/// </summary>
+		/// <remarks>
+		/// {0} : widget zone
+		/// {1} : store id
+		/// {2} : language id
+		/// </remarks>
+		public const string TOPIC_WIDGET_BYZONE_PATTERN_KEY = "sm.pres.topic.widget-byzone";
+		public const string TOPIC_WIDGET_BYZONE_MODEL_KEY = "sm.pres.topic.widget-byzone-{0}-{1}-{2}";
 
         /// <summary>
         /// Key for CategoryTemplate caching
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
@@ -81,20 +81,31 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone)
             #region Topic Widgets
 
             // add special "topic widgets" to the list
-            var allTopicsCacheKey = string.Format(ModelCacheEventConsumer.TOPIC_WIDGET_ALL_MODEL_KEY, _storeContext.CurrentStore.Id);
+			var allTopicsCacheKey = string.Format(ModelCacheEventConsumer.TOPIC_WIDGET_ALL_MODEL_KEY, _storeContext.CurrentStore.Id, _workContext.WorkingLanguage.Id);
             var topicWidgets = _cacheManager.Get(allTopicsCacheKey, () =>
             {
-                var result = _topicService.GetAllTopics(_storeContext.CurrentStore.Id);
-                var list = result.Where(x => x.RenderAsWidget).ToList();
-                list.Each(x => _dbContext.DetachEntity(x));
-                return list;
+				var allTopicWidgets = _topicService.GetAllTopics(_storeContext.CurrentStore.Id).Where(x => x.RenderAsWidget).ToList();
+				var stubs = allTopicWidgets
+					.Select(t => new TopicWidgetStub 
+					{
+ 						Id = t.Id,
+						Bordered = t.WidgetBordered,
+						ShowTitle = t.WidgetShowTitle,
+						SystemName = t.SystemName.SanitizeHtmlId(),
+						Title = t.GetLocalized(x => t.Title),
+						Body = t.GetLocalized(x => t.Body),
+						WidgetZones = t.GetWidgetZones().ToArray(),
+						Priority = t.Priority
+					})
+					.ToList();
+                return stubs;
             });
 
             var byZoneTopicsCacheKey = string.Format(ModelCacheEventConsumer.TOPIC_WIDGET_BYZONE_MODEL_KEY, widgetZone, _storeContext.CurrentStore.Id, _workContext.WorkingLanguage.Id);
             var topicsByZone = _cacheManager.Get(byZoneTopicsCacheKey, () =>
             {
                 var result = from t in topicWidgets
-                             where t.GetWidgetZones().Contains(widgetZone, StringComparer.InvariantCultureIgnoreCase)
+                             where t.WidgetZones.Contains(widgetZone, StringComparer.InvariantCultureIgnoreCase)
                              orderby t.Priority
                              select new WidgetRouteInfo
                              {
@@ -108,11 +119,11 @@ orderby t.Priority
                                     {"model", new TopicWidgetModel 
                                     { 
                                         Id = t.Id,
-                                        SystemName = t.SystemName.SanitizeHtmlId(),
-                                        ShowTitle = t.WidgetShowTitle,
-                                        IsBordered = t.WidgetBordered,
-                                        Title = t.GetLocalized(x => t.Title),
-                                        Html = t.GetLocalized(x => t.Body)
+                                        SystemName = t.SystemName,
+                                        ShowTitle = t.ShowTitle,
+                                        IsBordered = t.Bordered,
+                                        Title = t.Title,
+                                        Html = t.Body
                                     } }
                                  }
                              };
@@ -219,6 +230,18 @@ class SimpleWidgetStub
             public int Ordinal { get; set; }
         }
 
+		class TopicWidgetStub
+		{
+			public int Id { get; set; }
+			public string[] WidgetZones { get; set; }
+			public string SystemName { get; set; }
+			public bool ShowTitle { get; set; }
+			public bool Bordered { get; set; }
+			public string Title { get; set; }
+			public string Body { get; set; }
+			public int Priority { get; set; }
+		}
+
         #endregion
 
     }
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web/Infrastructure/DependencyRegistrar.cs
@@ -26,7 +26,7 @@ public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder)
 			builder.RegisterType<ShoppingCartController>().WithStaticCache();
 			builder.RegisterType<TopicController>().WithStaticCache();
 
-			builder.RegisterType<DefaultWidgetSelector>().As<IWidgetSelector>().WithRequestCache().InstancePerHttpRequest();
+			builder.RegisterType<DefaultWidgetSelector>().As<IWidgetSelector>().WithStaticCache().InstancePerHttpRequest();
             
             // installation localization service
             builder.RegisterType<InstallationLocalizationService>().As<IInstallationLocalizationService>().InstancePerHttpRequest();

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,11 @@ public static string MapMimeTypeToExtension(string mimeType)`
`31`	`31`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + mimeType, false);`
`35`		`- object value = key != null ? key.GetValue("Extension", null) : null;`
`36`		`- result = value != null ? value.ToString().Trim('.') : null;`
	`34`	`+ using (var key = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + mimeType, false))`
	`35`	`+ {`
	`36`	`+ object value = key != null ? key.GetValue("Extension", null) : null;`
	`37`	`+ result = value != null ? value.ToString().Trim('.') : null;`
	`38`	`+ }`
`37`	`39`	`}`
`38`	`40`	`catch (SecurityException)`
`39`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected virtual IEnumerable<PropertyInfo> GetSignaturePropertiesCore()`
`160`	`160`	`var properties = t.GetProperties()`
`161`	`161`	`.Where(p => Attribute.IsDefined(p, typeof(ObjectSignatureAttribute), true));`
`162`	`162`
`163`		`- return properties.Union(_extraSignatureProperties);`
	`163`	`+ return properties.Union(_extraSignatureProperties).ToList();`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@ public KeepAliveTask(IStoreContext storeContext)`
`15`	`15`	`{`
`16`	`16`	`this._storeContext = storeContext;`
`17`	`17`	`}`
`18`		`- /// <summary>`
`19`		`- /// Executes a task`
`20`		`- /// </summary>`
	`18`	`+`
`21`	`19`	`public void Execute()`
`22`	`20`	`{`
`23`	`21`	`var storeUrl = _storeContext.CurrentStore.Url.TrimEnd('\\').EnsureEndsWith("/");`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,14 @@ public override Stream Open()`
`40`	`40`	`private Stream GenerateStreamFromString(string value)`
`41`	`41`	`{`
`42`	`42`	`var stream = new MemoryStream();`
`43`		`- var writer = new StreamWriter(stream, Encoding.Unicode);`
`44`		`- writer.Write(value);`
`45`		`- writer.Flush();`
`46`		`- stream.Seek(0, SeekOrigin.Begin);`
`47`		`- return stream;`
	`43`	`+`
	`44`	`+ using (var writer = new StreamWriter(stream, Encoding.Unicode, 1024, true))`
	`45`	`+ {`
	`46`	`+ writer.Write(value);`
	`47`	`+ writer.Flush();`
	`48`	`+ stream.Seek(0, SeekOrigin.Begin);`
	`49`	`+ return stream;`
	`50`	`+ }`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,13 @@ public void Render()`
`73`	`73`	`public string ToHtmlString()`
`74`	`74`	`{`
`75`	`75`	`string str;`
`76`		`- using (StringWriter stringWriter = new StringWriter())`
	`76`	`+ using (var stringWriter = new StringWriter())`
`77`	`77`	`{`
`78`		`- this.WriteHtml(new HtmlTextWriter(stringWriter));`
`79`		`- str = stringWriter.ToString();`
	`78`	`+ using (var htmlWriter = new HtmlTextWriter(stringWriter))`
	`79`	`+ {`
	`80`	`+ this.WriteHtml(htmlWriter);`
	`81`	`+ str = stringWriter.ToString();`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`return str;`
`82`	`85`	`}`