Changeset 3 for trunk

Timestamp:

Nov 22, 2014, 11:50:49 PM (10 years ago)

Author:

chronos

Message:

• Added: Application is executed as Task by Scheduler. OS threads is used for scheduler for efficient execution.

Location:

trunk

Files:

• Apps/UClock.pas (modified) (2 diffs)
• ChronOS.lpi (modified) (1 diff)
• ChronOS.lpr (modified) (1 diff)
• Platform/Base/UPlatformBase.pas (modified) (1 diff)
• UAPI.pas (modified) (2 diffs)
• UFileSystem.pas (modified) (1 diff)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (2 diffs)
• UKernel.pas (modified) (6 diffs)

trunk/Apps/UClock.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UAPI;
+  Classes, SysUtils, UAPI, dateutils;
 
 type
@@ -23 +23 @@
 procedure TAppClock.Run;
 begin
-
+  while True do begin
+    API.WriteText('test');
+    API.Sleep(OneSecond);
+  end;
 end;
 

trunk/ChronOS.lpi

@@ -109 +109 @@
         <StackChecks Value="True"/>
       </Checks>
-      <VerifyObjMethodCallValidity Value="True"/>
     </CodeGeneration>
     <Linking>

trunk/ChronOS.lpr

@@ -4 +4 @@
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  {$IFDEF UNIX}
+  //{$IFDEF UseCThreads}
   cthreads,
-  {$ENDIF}{$ENDIF}
+  //{$ENDIF}
+  {$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms, UFormMain, UKernel, UFileSystem, UClock, UMemoryManager, UAPI,
-UPlatformBase, UList;
+  UPlatformBase, UList;
 
 {$R *.res}

trunk/Platform/Base/UPlatformBase.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UFileSystem;
+  Classes, SysUtils, UFileSystem, UKernel;
 
 type
+  { TCustomThread }
+
+  TCustomThread = class(TThread)
+    Task: TTask;
+    procedure Execute; override;
+  end;
+
+  { TBaseTask }
+
+  TBaseTask = class(TTask)
+    Thread: TCustomThread;
+    constructor Create; override;
+    destructor Destroy; override;
+  end;
+
+
   TBaseFileSystem = class(TFileSystem)
 
   end;
 
+  { TBaseScheduler }
+
+  TBaseScheduler = class(TScheduler)
+    function AddTask(Name: string; EntryPoint: TEvent): TTask; override;
+    constructor Create; override;
+    procedure Start; override;
+  end;
+
 implementation
+
+{ TBaseTask }
+
+constructor TBaseTask.Create;
+begin
+  inherited;
+  Thread := TCustomThread.Create(True);
+  Thread.Task := Self;
+end;
+
+destructor TBaseTask.Destroy;
+begin
+  Thread.Free;
+  inherited Destroy;
+end;
+
+{ TCustomThread }
+
+procedure TCustomThread.Execute;
+begin
+  Task.EntryPoint;
+end;
+
+{ TBaseScheduler }
+
+function TBaseScheduler.AddTask(Name: string; EntryPoint: TEvent): TTask;
+var
+  Task: TBaseTask;
+begin
+  Task := TBaseTask(inherited AddTask(Name, EntryPoint));
+  if Running then Task.Thread.Start;
+end;
+
+constructor TBaseScheduler.Create;
+begin
+  inherited Create;
+  TaskClass := TBaseTask;
+end;
+
+procedure TBaseScheduler.Start;
+var
+  I: Integer;
+begin
+  inherited Start;
+  for I := 0 to Tasks.Count - 1 do
+    TBaseTask(Tasks[I]).Thread.Start;
+end;
 
 end.

trunk/UAPI.pas

@@ -14 +14 @@
   TAPI = class
     procedure WriteText(Text: string);
+    procedure Sleep(Time: TDateTime);
   end;
 
@@ -30 +31 @@
 
 procedure TAPI.WriteText(Text: string);
+begin
+
+end;
+
+procedure TAPI.Sleep(Time: TDateTime);
 begin
 

trunk/UFileSystem.pas

@@ -33 +33 @@
   end;
 
+  TFileSystemClass = class of TFileSystem;
+
 implementation
 

trunk/UFormMain.lfm

@@ -1 +1 @@
 object Form1: TForm1
-  Left = 819
-  Height = 240
-  Top = 429
-  Width = 320
+  Left = 565
+  Height = 687
+  Top = 259
+  Width = 932
   Caption = 'Form1'
   OnCreate = FormCreate

trunk/UFormMain.pas

@@ -28 +28 @@
 
 uses
-  UList, UAPI, UClock;
+  UList, UAPI, UClock, UPlatformBase;
 
 {$R *.lfm}
@@ -39 +39 @@
 begin
   Kernel := TKernel.Create;
+  Kernel.SchedulerClass := TBaseScheduler;
+  Kernel.FileSystemClass := TBaseFileSystem;
 
   NewApp := TAppClock.Create;

trunk/UKernel.pas

@@ -9 +9 @@
 
 type
+  TEvent = procedure of object;
 
   TTaskState = (tsStopped, tsRunning, tsSuspended);
 
-  TTask = class
+  { TTask }
+
+  TTask = class(TNamedObject)
     Name: string;
     State: TTaskState;
+    EntryPoint: TEvent;
+    constructor Create; virtual;
   end;
 
-  TTasks = class(TObjectList)
+  TTaskClass = class of TTask;
 
+  { TScheduler }
+
+  TScheduler = class
+    TaskClass: TTaskClass;
+    Tasks: TNamedObjectList; // TList<TTask>
+    Running: Boolean;
+    procedure Start; virtual;
+    procedure Stop;
+    function AddTask(Name: string; EntryPoint: TEvent): TTask; virtual;
+    constructor Create; virtual;
+    destructor Destroy; override;
   end;
 
-  TScheduler = class
-    Tasks: TTasks;
-  end;
+  TSchedulerClass = class of TScheduler;
 
   TDrive = class(TNamedObject)
@@ -34 +48 @@
     Apps: TNamedObjectList; // TList<TApp>
     Drives: TNamedObjectList; // TList<TDrive>
-    procedure Execute(AFile: TFile);
+    Scheduler: TScheduler;
+    SchedulerClass: TSchedulerClass;
+    FileSystemClass: TFileSystemClass;
+    procedure AppExecute(AFile: TFile);
     procedure Init;
     procedure Run;
@@ -43 +60 @@
 implementation
 
-uses
-  UPlatformBase;
+{ TTask }
+
+constructor TTask.Create;
+begin
+
+end;
+
+{ TScheduler }
+
+procedure TScheduler.Start;
+begin
+  Running := True;
+end;
+
+procedure TScheduler.Stop;
+begin
+  Running := False;
+end;
+
+function TScheduler.AddTask(Name: string; EntryPoint: TEvent): TTask;
+var
+  NewTask: TTask;
+begin
+  NewTask := TaskClass.Create;
+  NewTask.Name := Name;
+  NewTask.EntryPoint := EntryPoint;
+  Tasks.Add(NewTask);
+  Result := NewTask;
+end;
+
+constructor TScheduler.Create;
+begin
+  TaskClass := TTask;
+  Tasks := TNamedObjectList.Create;
+end;
+
+destructor TScheduler.Destroy;
+begin
+  if Running then Stop;
+  Tasks.Free;
+  inherited Destroy;
+end;
 
 { TKernel }
 
-procedure TKernel.Execute(AFile: TFile);
+procedure TKernel.AppExecute(AFile: TFile);
 var
   App: TApp;
 begin
   App := TApp(Apps.FindByName(AFile.Name));
-  if Assigned(App) then App.Run
-    else raise Exception.Create('Application ''' + AFile.Name + ''' no found');
+  if Assigned(App) then begin
+    Scheduler.AddTask(App.Name, App.Run);
+  end else raise Exception.Create('Application ''' + AFile.Name + ''' no found');
 end;
 
@@ -62 +120 @@
   NewFile: TFile;
 begin
+  Scheduler.Free;
+  Scheduler := SchedulerClass.Create;
+
   NewDrive := TDrive.Create;
   NewDrive.Name := 'System';
-  NewDrive.FileSystem := TBaseFileSystem.Create;
+  NewDrive.FileSystem := FileSystemClass.Create;
   Drives.Add(NewDrive);
 
@@ -83 +144 @@
     SystemFileSystem := SystemDrive.FileSystem;
     AppFile := TFile(SystemFileSystem.TopDirectory.Items.FindByName('Clock'));
-    if Assigned(AppFile) then Execute(AppFile)
+    if Assigned(AppFile) then AppExecute(AppFile)
       else raise Exception.Create('Cannot start first application');
+    Scheduler.Start;
   end else raise Exception.Create('Missing System drive');
 end;
@@ -92 +154 @@
   Drives := TNamedObjectList.Create;
   Apps := TNamedObjectList.Create;
+  Scheduler := TScheduler.Create;
 end;
 
 destructor TKernel.Destroy;
 begin
+  Scheduler.Free;
   Apps.Free;
   Drives.Free;