Merge pull request #117 from georges-hatem/main

automatic thread-count detection, and minor cleanups

Author: gcarreno

entries/ghatem-fpc/README.md

@@ -3,6 +3,9 @@
 ## Requirements
  - mORMot2 library
  - 64-bit compilation
+
+## Usage
+ - -t flag to specify the thread-count (default reads the thread-count available on the CPU)
 
 ## Hardware + Environment
 host: 

entries/ghatem-fpc/src/OneBRCproj.lpi

@@ -47,6 +47,7 @@
               <DebugInfoType Value="dsDwarf3"/>
               <UseHeaptrc Value="True"/>
               <TrashVariables Value="True"/>
+              <UseValgrind Value="True"/>
               <UseExternalDbgSyms Value="True"/>
             </Debugging>
           </Linking>

entries/ghatem-fpc/src/OneBRCproj.lpr

@@ -6,7 +6,7 @@
   {$IFDEF UNIX}
   cthreads,
   {$ENDIF}
-  Classes, SysUtils, CustApp, Lclintf,
+  Classes, SysUtils, CustApp, Lclintf, UTF8Process,
   Baseline.Console,
   OneBRC;
 
@@ -32,8 +32,6 @@   TOneBRCApp = class(TCustomApplication)
 procedure TOneBRCApp.RunOneBRC;
 var
   vOneBRC: TOneBRC;
-  vStart: Int64;
-  vTime: Int64;
 begin
   vOneBRC := TOneBRC.Create (FThreadCount);
   try
@@ -123,7 +121,7 @@ procedure TOneBRCApp.DoRun;
     Exit;
   end;
 
-  FThreadCount := 32;
+  FThreadCount := GetSystemThreadCount;
   if HasOption(cShortOptThread, cLongOptThread) then begin
     FThreadCount := StrToInt (GetOptionValue(cShortOptThread, cLongOptThread));
   end;

entries/ghatem-fpc/src/onebrc.pas

@@ -36,7 +36,7 @@   TMyDictionary = class
   private
     FHashes: TKeys;
     FData  : TValues;
-    procedure InternalFind(const aKey: Cardinal; out aFound: Boolean; out aIndex: Integer); inline;
+    procedure InternalFind(const aKey: Cardinal; out aFound: Boolean; out aIndex: Integer);
   public
     constructor Create;
     property Keys: TKeys read FHashes;
@@ -249,7 +249,6 @@ constructor TOneBRC.Create (const aThreadCount: UInt16);
 
   for I := 0 to aThreadCount - 1 do begin
     FStationsDicts[I] := TMyDictionary.Create;
-    //FStationsDicts[I].Capacity := 45000;
   end;
 end;