textmap: dramatically increased text map parsing speed (text map now parses in the...

diff --git a/src/shared/xdynrec.pas b/src/shared/xdynrec.pas
index 87aaba0d00fb9ab7dfffbc6c4d5ce0ed51e95457..3e9ba66b1b9f4c3d6608857e7edf95d3842c907d 100644 (file)
--- a/src/shared/xdynrec.pas
+++ b/src/shared/xdynrec.pas
@@ -273,10 +273,16 @@ type
   end;
 
 
+{$IF DEFINED(D2D_DYNREC_PROFILER)}
+procedure xdynDumpProfiles ();
+{$ENDIF}
+
+
 implementation
 
 uses
-  SysUtils, e_log;
+  SysUtils, e_log, hashtable
+  {$IF DEFINED(D2D_DYNREC_PROFILER)},xprofiler{$ENDIF};
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -2129,13 +2135,47 @@ begin
 end;
 
 
+{$IF DEFINED(D2D_DYNREC_PROFILER)}
+var
+  profCloneRec: UInt64 = 0;
+  profFindRecType: UInt64 = 0;
+  profFieldSearching: UInt64 = 0;
+  profListDupChecking: UInt64 = 0;
+  profAddRecByType: UInt64 = 0;
+  profFieldValParsing: UInt64 = 0;
+  profFixDefaults: UInt64 = 0;
+  profRecValParse: UInt64 = 0;
+
+procedure xdynDumpProfiles ();
+begin
+  writeln('=== XDYNREC PROFILES ===');
+  writeln('record cloning: ', profCloneRec div 1000, '.', profCloneRec mod 1000, ' milliseconds');
+  writeln('findRecType   : ', profFindRecType div 1000, '.', profFindRecType mod 1000, ' milliseconds');
+  writeln('field[]       : ', profFieldSearching div 1000, '.', profFieldSearching mod 1000, ' milliseconds');
+  writeln('list dup check: ', profListDupChecking div 1000, '.', profListDupChecking mod 1000, ' milliseconds');
+  writeln('addRecByType  : ', profAddRecByType div 1000, '.', profAddRecByType mod 1000, ' milliseconds');
+  writeln('field valparse: ', profFieldValParsing div 1000, '.', profFieldValParsing mod 1000, ' milliseconds');
+  writeln('fix defaults  : ', profFixDefaults div 1000, '.', profFixDefaults mod 1000, ' milliseconds');
+  writeln('recvalparse   : ', profRecValParse div 1000, '.', profRecValParse mod 1000, ' milliseconds');
+end;
+{$ENDIF}
+
+
 procedure TDynRecord.parseValue (pr: TTextParser; beginEaten: Boolean=false);
 var
   fld: TDynField;
-  rec, trc, rv: TDynRecord;
+  rec: TDynRecord = nil;
+  trc{, rv}: TDynRecord;
+  {$IF DEFINED(D2D_DYNREC_PROFILER)}
+  stt, stall: UInt64;
+  {$ENDIF}
+  ids: THashStrInt = nil;
+  idtmp: AnsiString = '';
 begin
   if (mOwner = nil) then raise Exception.Create(Format('can''t parse record ''%s'' value without owner', [mName]));
 
+  {$IF DEFINED(D2D_DYNREC_PROFILER)}stall := curTimeMicro();{$ENDIF}
+
   // not a header?
   if not mHeader then
   begin
@@ -2145,65 +2185,98 @@ begin
   else
   begin
     assert(mHeaderRec = self);
+    ids := hashNewStrInt();
   end;
 
-  //writeln('parsing record <', mName, '>');
-  if not beginEaten then pr.expectTT(pr.TTBegin);
-  while (pr.tokType <> pr.TTEnd) do
-  begin
-    if (pr.tokType <> pr.TTId) then raise Exception.Create('identifier expected');
-    //writeln('<', mName, '.', pr.tokStr, '>');
-
-    // records
-    if mHeader then
+  try
+    //writeln('parsing record <', mName, '>');
+    if not beginEaten then pr.expectTT(pr.TTBegin);
+    while (pr.tokType <> pr.TTEnd) do
     begin
-      // add records with this type (if any)
-      trc := mOwner.findRecType(pr.tokStr);
-      if (trc <> nil) then
-      begin
-        rec := trc.clone();
-        rec.mHeaderRec := mHeaderRec;
-        try
-          pr.skipToken();
-          rec.parseValue(pr);
-          if (Length(rec.mId) > 0) then
-          begin
-            fld := field[pr.tokStr];
-            if (fld <> nil) and (fld.mRVal <> nil) then
+      if (pr.tokType <> pr.TTId) then raise Exception.Create('identifier expected');
+      //writeln('<', mName, '.', pr.tokStr, '>');
+
+      // records
+      if mHeader then
+      begin
+        // add records with this type (if any)
+        {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+        trc := mOwner.findRecType(pr.tokStr);
+        {$IF DEFINED(D2D_DYNREC_PROFILER)}profFindRecType := curTimeMicro()-stt;{$ENDIF}
+        if (trc <> nil) then
+        begin
+          {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+          rec := trc.clone();
+          {$IF DEFINED(D2D_DYNREC_PROFILER)}profCloneRec := curTimeMicro()-stt;{$ENDIF}
+          rec.mHeaderRec := mHeaderRec;
+          try
+            pr.skipToken();
+            rec.parseValue(pr);
+            if (Length(rec.mId) > 0) then
             begin
-              for rv in fld.mRVal do
-              begin
-                if (Length(rv.mId) > 0) and StrEqu(rv.mId, rec.mId) then raise Exception.Create(Format('duplicate thing ''%s'' in record ''%s''', [fld.mName, mName]));
-              end;
+              {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+              fld := field[pr.tokStr];
+              {$IF DEFINED(D2D_DYNREC_PROFILER)}profFieldSearching := curTimeMicro()-stt;{$ENDIF}
+              {$iF FALSE}
+                if (fld <> nil) and (fld.mRVal <> nil) then
+                begin
+                  {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+                  for rv in fld.mRVal do
+                  begin
+                    if (Length(rv.mId) > 0) and StrEqu(rv.mId, rec.mId) then raise Exception.Create(Format('duplicate thing ''%s'' in record ''%s''', [fld.mName, mName]));
+                  end;
+                  {$IF DEFINED(D2D_DYNREC_PROFILER)}profListDupChecking := curTimeMicro()-stt;{$ENDIF}
+                end;
+              {$ELSE}
+                if (fld <> nil) and (fld.mRVal <> nil) then
+                begin
+                  {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+                  idtmp := trc.mName+':'+rec.mId;
+                  if ids.put(idtmp, 1) then raise Exception.Create(Format('duplicate thing ''%s'' in record ''%s''', [fld.mName, mName]));
+                  {$IF DEFINED(D2D_DYNREC_PROFILER)}profListDupChecking := curTimeMicro()-stt;{$ENDIF}
+                end;
+              {$ENDIF}
             end;
+            {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+            addRecordByType(rec.mName, rec);
+            {$IF DEFINED(D2D_DYNREC_PROFILER)}profAddRecByType := curTimeMicro()-stt;{$ENDIF}
+            rec := nil;
+          finally
+            rec.Free();
           end;
-          addRecordByType(rec.mName, rec);
-          rec := nil;
-        finally
-          rec.Free();
+          continue;
         end;
+      end;
+
+      // fields
+      {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+      fld := field[pr.tokStr];
+      {$IF DEFINED(D2D_DYNREC_PROFILER)}profFieldSearching := curTimeMicro()-stt;{$ENDIF}
+      if (fld <> nil) then
+      begin
+        if fld.defined then raise Exception.Create(Format('duplicate field ''%s'' in record ''%s''', [fld.mName, mName]));
+        if fld.internal then raise Exception.Create(Format('internal field ''%s'' in record ''%s''', [fld.mName, mName]));
+        pr.skipToken();
+        {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+        fld.parseValue(pr);
+        {$IF DEFINED(D2D_DYNREC_PROFILER)}profFieldValParsing := curTimeMicro()-stt;{$ENDIF}
         continue;
       end;
-    end;
 
-    // fields
-    fld := field[pr.tokStr];
-    if (fld <> nil) then
-    begin
-      if fld.defined then raise Exception.Create(Format('duplicate field ''%s'' in record ''%s''', [fld.mName, mName]));
-      if fld.internal then raise Exception.Create(Format('internal field ''%s'' in record ''%s''', [fld.mName, mName]));
-      pr.skipToken();
-      fld.parseValue(pr);
-      continue;
+      // something is wrong
+      raise Exception.Create(Format('unknown field ''%s'' in record ''%s''', [pr.tokStr, mName]));
     end;
-
-    // something is wrong
-    raise Exception.Create(Format('unknown field ''%s'' in record ''%s''', [pr.tokStr, mName]));
+    pr.expectTT(pr.TTEnd);
+    // fix field defaults
+    {$IF DEFINED(D2D_DYNREC_PROFILER)}stt := curTimeMicro();{$ENDIF}
+    for fld in mFields do fld.fixDefaultValue();
+    {$IF DEFINED(D2D_DYNREC_PROFILER)}profFixDefaults := curTimeMicro()-stt;{$ENDIF}
+    //writeln('done parsing record <', mName, '>');
+    //{$IF DEFINED(D2D_DYNREC_PROFILER)}writeln('stall: ', curTimeMicro()-stall);{$ENDIF}
+    {$IF DEFINED(D2D_DYNREC_PROFILER)}profRecValParse := curTimeMicro()-stall;{$ENDIF}
+  finally
+    ids.Free();
   end;
-  pr.expectTT(pr.TTEnd);
-  // fix field defaults
-  for fld in mFields do fld.fixDefaultValue();
-  //writeln('done parsing record <', mName, '>');
 end;
 
 
@@ -2587,11 +2660,8 @@ begin
     res.parseValue(pr);
     result := res;
     res := nil;
-  except on E: Exception do
-    begin
-      res.Free();
-      raise;
-    end;
+  finally
+    res.Free();
   end;
 end;
 
@@ -2607,11 +2677,8 @@ begin
     res.parseBinValue(st);
     result := res;
     res := nil;
-  except on E: Exception do
-    begin
-      res.Free();
-      raise;
-    end;
+  finally
+    res.Free();
   end;
 end;
 

diff --git a/src/tools/mapcvt.dpr b/src/tools/mapcvt.dpr
index cf4edc1692b956688ccad9778d2b0cb1da648c10..de1c0a36427acbfc0d0d6e84b07ea8c8230228f7 100644 (file)
--- a/src/tools/mapcvt.dpr
+++ b/src/tools/mapcvt.dpr
@@ -1,5 +1,7 @@
 {$INCLUDE ../shared/a_modes.inc}
-{$APPTYPE CONSOLE}
+{$IFDEF WINDOWS}
+  {$APPTYPE CONSOLE}
+{$ENDIF}
 
 uses
   SysUtils, Classes,
@@ -11,6 +13,7 @@ uses
   xdynrec in '../shared/xdynrec.pas',
   xprofiler in '../shared/xprofiler.pas',
   utils in '../shared/utils.pas',
+  hashtable in '../shared/hashtable.pas',
   conbuf in '../shared/conbuf.pas',
   e_log in '../engine/e_log.pas',
   wadreader in '../shared/wadreader.pas',
@@ -123,6 +126,8 @@ begin
     pr.Free();
   end;
 
+  {$IF DEFINED(D2D_DYNREC_PROFILER)}xdynDumpProfiles();{$ENDIF}
+
   assert(totext >= 0);
 
   writeln('writing "', outname, '"...');

diff --git a/src/tools/mapgen.dpr b/src/tools/mapgen.dpr
index 32db7726c3f03d841708a271cfea9c7ec4a56377..9a98f712be4e676662a34514530cdf60997f14ff 100644 (file)
--- a/src/tools/mapgen.dpr
+++ b/src/tools/mapgen.dpr
@@ -1,12 +1,16 @@
 {$INCLUDE ../shared/a_modes.inc}
-{$APPTYPE CONSOLE}
+{$IFDEF WINDOWS}
+  {$APPTYPE CONSOLE}
+{$ENDIF}
 
 uses
   SysUtils, Classes,
   xstreams in '../shared/xstreams.pas',
   xparser in '../shared/xparser.pas',
   xdynrec in '../shared/xdynrec.pas',
+  xprofiler in '../shared/xprofiler.pas',
   utils in '../shared/utils.pas',
+  hashtable in '../shared/hashtable.pas',
   conbuf in '../shared/conbuf.pas',
   e_log in '../engine/e_log.pas';