Changeset 439 for ModularSystem/UModularSystem.pas

Timestamp:

Nov 19, 2012, 2:40:44 PM (12 years ago)

Author:

chronos

Message:

• Modified: Optiomization using Update blocking during mass operations.
• Added: Measuring modules start time.

File:

• ModularSystem/UModularSystem.pas (modified) (25 diffs)

ModularSystem/UModularSystem.pas

@@ -43 +43 @@
     FFileName: string;
     FWebSite: string;
+    FStartUpTime: TDateTime;
     procedure SetEnabled(AValue: Boolean);
     procedure SetInstalled(AValue: Boolean);
@@ -74 +75 @@
     property Installed: Boolean read FInstalled write SetInstalled;
     property Enabled: Boolean read FEnabled write SetEnabled;
+    property StartUpTime: TDateTime read FStartUpTime;
   published
     property Identification: string read FIdentification write FIdentification; // Unique system name
@@ -110 +112 @@
     FOptions: TModuleManagerOptions;
     procedure SetAPI(AValue: TAPI);
-    procedure DoUpdate;
+    procedure DoUpdate(Sender: TObject);
   public
     Modules: TListModule; // TObjectList<TModule>
@@ -122 +124 @@
     procedure LoadFromRegistry(Context: TRegistryContext);
     procedure SaveToRegistry(Context: TRegistryContext);
-    procedure BeginUpdate;
-    procedure EndUpdate;
-    procedure Update;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -154 +153 @@
   A: Integer;
 begin
+  try
+    BeginUpdate;
   for I := 0 to Count - 1 do
   with TModule(Items[I]) do
@@ -169 +170 @@
       if Actions[A] = maUninstall then Uninstall;
       if Actions[A] = maUpgrade then Upgrade;
-      if Actions[A] = maEnable then Enabled := True;
-      if Actions[A] = maDisable then Enabled := False;
+      if Actions[A] = maEnable then Enable;
+      if Actions[A] = maDisable then Disable;
     end;
+  finally
+    EndUpdate;
+  end;
 end;
 
@@ -196 +200 @@
 end;
 
-procedure TModuleManager.DoUpdate;
+procedure TModuleManager.DoUpdate(Sender: TObject);
 begin
   if Assigned(FOnUpdate) then FOnUpdate(Self);
@@ -263 +267 @@
   Module.FManager := Self;
   Module.API := API;
-  Update;
+  Modules.Update;
 end;
 
@@ -269 +273 @@
 begin
   Modules.Remove(Module);
-  Update;
+  Modules.Update;
 end;
 
@@ -277 +281 @@
   Modules := TListModule.Create;
   Modules.OwnsObjects := False;
+  Modules.OnUpdate := DoUpdate;
 end;
 
@@ -296 +301 @@
     with TModule(Modules[I]) do begin
       OpenKey(Context.Key + '\' + Identification, True);
-      Enabled := ReadBoolWithDefault('Enable', Enabled);
+      Installed := ReadBoolWithDefault('Installed', Installed);
+      Enabled := ReadBoolWithDefault('Enabled', Enabled);
     end;
   finally
@@ -313 +319 @@
     with TModule(Modules[I]) do begin
       OpenKey(Context.Key + '\' + Identification, True);
-      WriteBool('Enable', Enabled);
+      WriteBool('Enabled', Enabled);
+      WriteBool('Installed', Installed);
     end;
   finally
     Free;
   end;
-end;
-
-procedure TModuleManager.BeginUpdate;
-begin
-  Inc(FUpdateCount);
-end;
-
-procedure TModuleManager.EndUpdate;
-begin
-  if FUpdateCount > 0 then Dec(FUpdateCount);
-  if FUpdateCount = 0 then DoUpdate;
-end;
-
-procedure TModuleManager.Update;
-begin
-  if FUpdateCount = 0 then DoUpdate;
 end;
 
@@ -378 +369 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumSuperiorDependenciesCascade(List);
+    EnumDependenciesCascade(List, [mcNotEnabled]);
     List.Perform([maEnable], [mcNotEnabled]);
   finally
@@ -397 +388 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumSuperiorDependenciesCascade(List);
+    EnumSuperiorDependenciesCascade(List, [mcEnabled]);
     List.Perform([maDisable], [mcEnabled]);
   finally
     List.Free;
   end;
-  Manager.Update;
+  Manager.Modules.Update;
 end;
 
@@ -422 +413 @@
 begin
   if FEnabled = AValue then Exit;
-  if FEnabled then Enable else Disable;
+  if AValue then Enable else Disable;
 end;
 
@@ -428 +419 @@
 var
   List: TListModule;
+  StartTime: TDateTime;
 begin
   if not Enabled or Running then Exit;
@@ -434 +426 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumDependenciesCascade(List);
+    EnumDependenciesCascade(List, [mcNotRunning]);
     List.Perform([maStart], [mcNotRunning]);
   finally
     List.Free;
   end;
+  StartTime := Now;
   DoStart;
+  FStartUpTime := Now - StartTime;
   FRunning := True;
-  Manager.Update;
+  Manager.Modules.Update;
 end;
 
@@ -453 +447 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumSuperiorDependenciesCascade(List);
+    EnumSuperiorDependenciesCascade(List, [mcRunning]);
     List.Perform([maStop], [mcRunning]);
   finally
@@ -459 +453 @@
   end;
   DoStop;
-  Manager.Update;
+  Manager.Modules.Update;
 end;
 
@@ -476 +470 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumDependenciesCascade(List);
+    EnumDependenciesCascade(List, [mcNotInstalled]);
     List.Perform([maInstall], [mcNotInstalled]);
   finally
@@ -483 +477 @@
   FInstalled := True;
   DoInstall;
-  Enable; // Auto enable installed module
-  Manager.Update;
+  //Enable; // Auto enable installed module
+  Manager.Modules.Update;
 end;
 
@@ -496 +490 @@
     List := TListModule.Create;
     List.OwnsObjects := False;
-    EnumSuperiorDependenciesCascade(List);
+    EnumSuperiorDependenciesCascade(List, [mcInstalled]);
     List.Perform([maUninstall], [mcInstalled]);
   finally
@@ -503 +497 @@
   FInstalled := False;
   DoUninstall;
-  Manager.Update;
+  Manager.Modules.Update;
 end;
 
@@ -521 +515 @@
     Start;
   end else DoUpgrade;
-  Manager.Update;
+  Manager.Modules.Update;
 end;
 
@@ -541 +535 @@
 begin
   FInstalled := Value;
-  Manager.Update;
+  Manager.Modules.Update;
 end;