Better function list updating in regards to locking

Author: ollydev

Source/ide/simba.form_functionlist.lfm

@@ -1,15 +1,16 @@
 object SimbaFunctionListForm: TSimbaFunctionListForm
   Left = -838
-  Height = 463
+  Height = 810
   Top = 278
-  Width = 428
+  Width = 749
   Caption = 'Function List'
+  DesignTimePPI = 168
   ShowInTaskBar = stAlways
   LCLVersion = '4.0.0.4'
   object Images: TImageList
     OnGetWidthForPPI = ImagesGetWidthForPPI
-    Left = 172
-    Top = 243
+    Left = 301
+    Top = 425
     Bitmap = {
       4C7A090000001000000010000000FE0900000000000078DAED98075454571A80
       D9933DD9B886C4355911980288D83642C482C678442C31C9311AC41A8393444D

Source/ide/simba.form_functionlist.pas

@@ -10,8 +10,9 @@
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, Menus, ImgList, syncobjs,
+  Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, Menus, ImgList,
   simba.base,
+  simba.containers,
   simba.ide_codetools_parser,
   simba.ide_codetools_insight,
   simba.ide_tab,
@@ -85,11 +86,13 @@   TSimbaFunctionListForm = class(TForm)
     Images: TImageList;
 
     procedure ImagesGetWidthForPPI(Sender: TCustomImageList; AImageWidth, APPI: Integer; var AResultWidth: Integer);
+  protected type
+    TFunctionListPageList = specialize TSimbaList<TSimbaFunctionListPage>;
   protected
-    FUpdateLock: TCriticalSection;
     FUpdateThread: TThread;
     FIsIdle: Boolean;
     FNotebook: TSimbaNotebook;
+    FPendingRemoves: TFunctionListPageList;
 
     function PageForTab(Tab: TSimbaScriptTab): TSimbaPage;
 
@@ -120,10 +123,10 @@ implementation
   simba.ide_utils,
   simba.ide_showdeclaration,
   simba.vartype_string,
-  simba.threading,
   simba.form_tabs,
   simba.nativeinterface,
-  simba.fs;
+  simba.fs,
+  simba.threading;
 
 const
   IMG_FOLDER = 0;
@@ -605,9 +608,9 @@ constructor TSimbaFunctionListPage.Create(AOwner: TComponent);
   FIncludesNode := FTreeView.AddNode('Includes', IMG_FOLDER);
   FPluginsNode  := FTreeView.AddNode('Plugins', IMG_FOLDER);
 
-  FScriptNodeState := TTreeNodeExpandedState.Create(TTreeNode(nil));
+  FScriptNodeState   := TTreeNodeExpandedState.Create(TTreeNode(nil));
   FIncludesNodeState := TTreeNodeExpandedState.Create(TTreeNode(nil));
-  FPluginsNodeState := TTreeNodeExpandedState.Create(TTreeNode(nil));
+  FPluginsNodeState  := TTreeNodeExpandedState.Create(TTreeNode(nil));
 
   SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_MODIFIED, @DoEditorModified);
   SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_CHANGE, @DoEditorModified); // force a update on change
@@ -678,7 +681,7 @@ procedure TSimbaFunctionListPage.Fill;
   end;
 
 begin
-  if not FNeedUpdate then
+  if (not FNeedUpdate) then
     Exit;
 
   RunInMainThread(@BeginUpdate);
@@ -716,12 +719,13 @@ procedure TSimbaFunctionListForm.DoUpdateThread;
   try
     while not TThread.CurrentThread.CheckTerminated do
     begin
-      if FIsIdle and FUpdateLock.TryEnter() then
-      try
+      if FIsIdle then
+      begin
         if (FNotebook.ActivePage <> nil) then
           TSimbaFunctionListPage(FNotebook.ActivePage).Fill();
-      finally
-        FUpdateLock.Leave();
+
+        while (FPendingRemoves.Count > 0) do
+          RunInMainThread(@FPendingRemoves.Pop.Free);
       end;
 
       Sleep(350);
@@ -748,7 +752,7 @@ procedure TSimbaFunctionListForm.DoTabClosed(Sender: TObject);
 begin
   Page := PageForTab(TSimbaScriptTab(Sender));
   if (Page <> nil) then
-    Page.Free();
+    FPendingRemoves.Add(TSimbaFunctionListPage(Page));
 
   {$IFDEF DEBUG}
   WriteLn('DoTabClosed: PageCount=',FNotebook.PageCount);
@@ -782,11 +786,11 @@ constructor TSimbaFunctionListForm.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
 
-  SimbaIDEEvents.Register(Self, SimbaIDEEvent.CODETOOLS_SETUP,  @DoCodetoolsSetup);
-  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_CHANGE,       @DoTabChange);
-  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_CLOSED,       @DoTabClosed);
-  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_ADD,          @DoTabAdd);
-  SimbaIDEEvents.Register(Self, SimbaIDEEvent.SPLITTER_DOUBLE_CLICK,  @DoDoubleClickSplitter);
+  SimbaIDEEvents.Register(Self, SimbaIDEEvent.CODETOOLS_SETUP,       @DoCodetoolsSetup);
+  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_CHANGE,            @DoTabChange);
+  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_CLOSED,            @DoTabClosed);
+  SimbaIDEEvents.Register(Self, SimbaIDEEvent.TAB_ADD,               @DoTabAdd);
+  SimbaIDEEvents.Register(Self, SimbaIDEEvent.SPLITTER_DOUBLE_CLICK, @DoDoubleClickSplitter);
 
   with TIdleTimer.Create(Self) do
   begin
@@ -802,18 +806,16 @@ constructor TSimbaFunctionListForm.Create(TheOwner: TComponent);
   FNotebook.Parent := Self;
   FNotebook.Align := alClient;
 
-  FUpdateLock := TCriticalSection.Create();
+  FPendingRemoves := TFunctionListPageList.Create();
 end;
 
 destructor TSimbaFunctionListForm.Destroy;
 begin
-  FUpdateLock.Enter();
   FUpdateThread.Terminate();
   FUpdateThread.WaitFor();
-  FUpdateLock.Leave();
 
-  FreeAndNil(FUpdateLock);
   FreeAndNil(FUpdateThread);
+  FreeAndNil(FPendingRemoves);
 
   inherited Destroy();
 end;

Source/simba.containers.pas

@@ -21,15 +21,15 @@ interface
 
 type
   generic TSimbaList<_T> = class(TObject)
-  private
-    function GetFirst: _T;
-    function GetLast: _T;
   public type
     TArr = array of _T;
   protected
     FArr: TArr;
     FCount: Integer;
 
+    function GetPop: _T; virtual;
+    function GetFirst: _T; virtual;
+    function GetLast: _T; virtual;
     function GetItem(Index: Integer): _T; virtual;
     procedure SetItem(Index: Integer; AValue: _T); virtual;
   public
@@ -41,6 +41,7 @@   generic TSimbaList<_T> = class(TObject)
     property Count: Integer read FCount;
     property Items[Index: Integer]: _T read GetItem write SetItem; default;
 
+    property Pop: _T read GetPop;
     property First: _T read GetFirst;
     property Last: _T read GetLast;
   end;
@@ -223,6 +224,14 @@ function TSimbaList.GetLast: _T;
   Result := FArr[FCount - 1];
 end;
 
+function TSimbaList.GetPop: _T;
+begin
+  if (FCount = 0) then
+    SimbaException('%s.Pop: Index %d out of bounds', [ClassName, FCount - 1]);
+  Result := FArr[FCount - 1];
+  Dec(FCount);
+end;
+
 function TSimbaList.GetItem(Index: Integer): _T;
 begin
   if (Index < 0) or (Index >= FCount) then