Changeset 429

Timestamp:

Oct 17, 2012, 1:21:41 PM (12 years ago)

Author:

chronos

Message:

• Modified: ModularSystem now uset DoStart, DoStop, DoInstall, DoUninstall, DoUpgrade methods in place of Before/After methods.

Location:

ModularSystem

Files:

• Demo (modified) (1 prop)
• Demo/Demo.lpi (modified) (4 diffs)
• Demo/Demo.lpr (modified) (1 diff)
• Demo/ULogForm.lfm (added)
• Demo/ULogForm.pas (added)
• Demo/UMainForm.lfm (modified) (9 diffs)
• Demo/UMainForm.pas (modified) (8 diffs)
• Demo/UModuleACL.pas (modified) (2 diffs)
• Demo/UModuleBase.pas (modified) (2 diffs)
• Demo/UModuleUser.pas (modified) (2 diffs)
• UModularSystem.pas (modified) (11 diffs)

ModularSystem/Demo

@@ -5 +5 @@
 Demo.lps
 Demo
+heaptrclog.trc

@@ -5 +5 @@
 Demo.lps
 Demo
+heaptrclog.trc

ModularSystem/Demo/Demo.lpi

@@ -41 +41 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="6">
       <Unit0>
         <Filename Value="Demo.lpr"/>
@@ -70 +70 @@
         <UnitName Value="UModuleACL"/>
       </Unit4>
+      <Unit5>
+        <Filename Value="ULogForm.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="LogForm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="ULogForm"/>
+      </Unit5>
     </Units>
   </ProjectOptions>
@@ -91 +99 @@
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>
@@ -98 +109 @@
     </Linking>
     <Other>
+      <CustomOptions Value="-dDEBUG"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>

ModularSystem/Demo/Demo.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UMainForm, UModuleUser, UModuleBase, UModuleACL;
+  Forms, UMainForm, UModuleUser, UModuleBase, UModuleACL, ULogForm, SysUtils;
 
 {$R *.res}
 
+{$IFDEF DEBUG}
+const
+  HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
+
 begin
+  {$IFDEF DEBUG}
+  // Heap trace
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
+
   RequireDerivedFormResource := True;
   Application.Initialize;
   Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TLogForm, LogForm);
   Application.Run;
 end.

ModularSystem/Demo/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 283
-  Height = 316
-  Top = 182
+  Left = 217
+  Height = 308
+  Top = 177
   Width = 649
   Caption = 'Module test'
-  ClientHeight = 316
+  ClientHeight = 308
   ClientWidth = 649
   OnCreate = FormCreate
@@ -13 +13 @@
   object ListViewModules: TListView
     Left = 8
-    Height = 265
+    Height = 257
     Top = 8
     Width = 632
@@ -51 +51 @@
     OwnerData = True
     PopupMenu = PopupMenu1
+    ReadOnly = True
     RowSelect = True
     TabOrder = 0
@@ -60 +61 @@
     Left = 8
     Height = 25
-    Top = 281
+    Top = 273
     Width = 75
     Action = AModuleInstall
@@ -69 +70 @@
     Left = 88
     Height = 25
-    Top = 281
+    Top = 273
     Width = 75
     Action = AModuleUninstall
@@ -78 +79 @@
     Left = 168
     Height = 25
-    Top = 281
+    Top = 273
     Width = 75
     Action = AModuleUpdate
@@ -87 +88 @@
     Left = 248
     Height = 25
-    Top = 281
+    Top = 273
     Width = 75
     Action = AModuleStart
@@ -96 +97 @@
     Left = 328
     Height = 25
-    Top = 281
+    Top = 273
     Width = 75
     Action = AModuleStop
@@ -145 +146 @@
     end
   end
+  object ModuleManager: TModuleManager
+    left = 296
+    top = 72
+  end
 end

ModularSystem/Demo/UMainForm.pas

@@ -1 +1 @@
 unit UMainForm;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
@@ -32 +32 @@
     MenuItem4: TMenuItem;
     MenuItem5: TMenuItem;
+    ModuleManager: TModuleManager;
     PopupMenu1: TPopupMenu;
     procedure AModuleStartExecute(Sender: TObject);
@@ -47 +48 @@
     procedure RegisterModules;
   public
-    ModuleManager: TModuleManager;
+    procedure Log(Text: string);
     procedure RefreshList;
   end;
@@ -63 +64 @@
 
 uses
-  UModuleUser, UModuleBase, UModuleACL;
+  UModuleUser, UModuleBase, UModuleACL, ULogForm;
 
 
@@ -106 +107 @@
 end;
 
+procedure TMainForm.Log(Text: string);
+begin
+  LogForm.Memo1.Lines.Add(Text);
+end;
+
 procedure TMainForm.RefreshList;
 begin
@@ -116 +122 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  ModuleManager := TModuleManager.Create(nil);
   RegisterModules;
 end;
@@ -220 +225 @@
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(ModuleManager);
 end;
 
@@ -226 +230 @@
 begin
   RefreshList;
+  LogForm.Show;
 end;
 

ModularSystem/Demo/UModuleACL.pas

@@ -12 +12 @@
 
   TModuleACL = class(TModule)
+  protected
+    procedure DoInstall; override;
+    procedure DoStart; override;
+    procedure DoStop; override;
+    procedure DoUninstall; override;
+  public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -19 +25 @@
 implementation
 
+uses
+  UMainForm;
+
 { TModuleACL }
+
+procedure TModuleACL.DoStart;
+begin
+  MainForm.Log(Identification + ' started');
+end;
+
+procedure TModuleACL.DoStop;
+begin
+  MainForm.Log(Identification + ' stopped');
+end;
+
+procedure TModuleACL.DoInstall;
+begin
+  MainForm.Log(Identification + ' installed');
+end;
+
+procedure TModuleACL.DoUninstall;
+begin
+  MainForm.Log(Identification + ' uninstalled');
+end;
 
 constructor TModuleACL.Create(AOwner: TComponent);

ModularSystem/Demo/UModuleBase.pas

@@ -9 +9 @@
 
 type
+
+  { TModuleBase }
+
   TModuleBase = class(TModule)
+  protected
+    procedure DoStart; override;
+    procedure DoStop; override;
+    procedure DoInstall; override;
+    procedure DoUninstall; override;
+  public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -17 +26 @@
 implementation
 
+uses
+  UMainForm;
+
 { TModuleUser }
+
+procedure TModuleBase.DoStart;
+begin
+  MainForm.Log(Identification + ' started');
+end;
+
+procedure TModuleBase.DoStop;
+begin
+  MainForm.Log(Identification + ' stopped');
+end;
+
+procedure TModuleBase.DoInstall;
+begin
+  MainForm.Log(Identification + ' installed');
+end;
+
+procedure TModuleBase.DoUninstall;
+begin
+  MainForm.Log(Identification + ' uninstalled');
+end;
 
 constructor TModuleBase.Create(AOwner: TComponent);

ModularSystem/Demo/UModuleUser.pas

@@ -13 +13 @@
 
   TModuleUser = class(TModule)
+  protected
+    procedure DoInstall; override;
+    procedure DoStart; override;
+    procedure DoStop; override;
+    procedure DoUninstall; override;
+  public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -19 +25 @@
 implementation
 
+uses
+  UMainForm;
+
 { TModuleUser }
+
+procedure TModuleUser.DoStart;
+begin
+  MainForm.Log(Identification + ' started');
+end;
+
+procedure TModuleUser.DoStop;
+begin
+  MainForm.Log(Identification + ' stopped');
+end;
+
+procedure TModuleUser.DoInstall;
+begin
+  MainForm.Log(Identification + ' installed');
+end;
+
+procedure TModuleUser.DoUninstall;
+begin
+  MainForm.Log(Identification + ' uninstalled');
+end;
 
 constructor TModuleUser.Create(AOwner: TComponent);

ModularSystem/UModularSystem.pas

@@ -22 +22 @@
     FRunning: Boolean;
     FInstalled: Boolean;
-    Manager: TModuleManager;
+    FManager: TModuleManager;
     FVersion: string;
     FIdentification: string;
@@ -34 +34 @@
     procedure SetRunning(AValue: Boolean);
   protected
-    procedure BeforeStart; virtual;
-    procedure AfterStart; virtual;
-    procedure BeforeStop; virtual;
-    procedure AfterStop; virtual;
+    procedure DoStart; virtual;
+    procedure DoStop; virtual;
+    procedure DoInstall; virtual;
+    procedure DoUninstall; virtual;
+    procedure DoUpgrade; virtual;
   public
     API: TAPI;
-    procedure Start; virtual;
-    procedure Stop; virtual;
-    procedure Install; virtual;
-    procedure Uninstall; virtual;
-    procedure Upgrade; virtual;
+    procedure Start;
+    procedure Stop;
+    procedure Install;
+    procedure Uninstall;
+    procedure Upgrade;
     procedure EnumModulesStart(ModuleList: TStringList);
     procedure EnumModulesStop(ModuleList: TStringList);
@@ -56 +57 @@
     property Enabled: Boolean read FEnabled write SetEnabled;
   published
+    property Manager: TModuleManager read FManager;
     property Version: string read FVersion write FVersion;
     property Identification: string read FIdentification write FIdentification;
@@ -260 +262 @@
 begin
   Modules.Add(Module);
-  Module.Manager := Self;
+  Module.FManager := Self;
   Module.API := API;
   Module.Enabled := Enabled;
@@ -310 +312 @@
   inherited;
   Modules := TObjectList.Create;
+  //Modules.OwnsObjects := False;
 end;
 
@@ -316 +319 @@
   StopAll;
   FreeAndNil(Modules);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -344 +347 @@
     RootKey := Context.RootKey;
     for I := 0 to Modules.Count - 1 do
-    with TModule(Modules[I]) do begin
+    with TModule(Modules[I]) do
+    if Enabled then begin
       OpenKey(Context.Key + '\' + Identification, True);
       WriteBool('Run', Running);
@@ -361 +365 @@
 end;
 
-procedure TModule.BeforeStart;
-begin
-  if Running then Exit;
+procedure TModule.DoStart;
+begin
+
+end;
+
+procedure TModule.DoStop;
+begin
+
+end;
+
+procedure TModule.DoInstall;
+begin
+
+end;
+
+procedure TModule.DoUninstall;
+begin
+
+end;
+
+procedure TModule.DoUpgrade;
+begin
+
+end;
+
+procedure TModule.SetInstalled(AValue: Boolean);
+begin
+  if FInstalled = AValue then Exit;
+  if AValue then Install else Uninstall;
+end;
+
+procedure TModule.SetEnabled(AValue: Boolean);
+begin
+  if FEnabled = AValue then Exit;
+  FEnabled := AValue;
+  if not FEnabled and FInstalled then Uninstall;
+end;
+
+procedure TModule.Start;
+begin
+  if not Enabled or Running then Exit;
   if not Installed then Install;
   Manager.StartDependencies(Identification, Dependencies);
-end;
-
-procedure TModule.AfterStart;
-begin
+  DoStart;
   FRunning := True;
 end;
 
-procedure TModule.BeforeStop;
+procedure TModule.Stop;
 begin
   if not Running then Exit;
   FRunning := False;
   Manager.StopDependencies(Identification);
-end;
-
-procedure TModule.AfterStop;
-begin
-end;
-
-procedure TModule.SetInstalled(AValue: Boolean);
-begin
-  if FInstalled = AValue then Exit;
-  if AValue then Install else Uninstall;
-end;
-
-procedure TModule.SetEnabled(AValue: Boolean);
-begin
-  if FEnabled = AValue then Exit;
-  FEnabled := AValue;
-  if not FEnabled and FInstalled then Uninstall;
-end;
-
-procedure TModule.Start;
-begin
-  BeforeStart;
-  AfterStart;
-end;
-
-procedure TModule.Stop;
-begin
-  BeforeStop;
-  AfterStop;
+  DoStop;
 end;
 
 procedure TModule.Install;
 begin
-  if Installed then Exit;
+  if not Enabled or Installed then Exit;
   Manager.InstallDependencies(Identification, Dependencies);
   FInstalled := True;
   if Assigned(Manager.FOnModuleChange) then
     Manager.FOnModuleChange(Manager, Self);
+  DoInstall;
 end;
 
@@ -424 +436 @@
   Manager.UninstallDependencies(Identification);
   FInstalled := False;
+  DoUninstall;
   if Assigned(Manager.FOnModuleChange) then
     Manager.FOnModuleChange(Manager, Self);
@@ -430 +443 @@
 procedure TModule.Upgrade;
 begin
-  if not Running then Exit;
+  if not Enabled or not Installed then Exit;
+  if Running then try
+    Stop;
+    DoUpgrade;
+  finally
+    Start;
+  end else DoUpgrade;
 end;
 
@@ -474 +493 @@
 begin
   Running := False;
-  Description.Free;
-  Dependencies.Free;
-  inherited Destroy;
+  FreeAndNil(FDescription);
+  FreeAndNil(FDependencies);
+  inherited;
 end;
 

@@ -5 +5 @@
 Demo.lps
 Demo
+heaptrclog.trc