Fix for Mantis bug 1969

ganelson · Apr 15, 2022 · 5b8de72 · 5b8de72
1 parent 73fbe6c
commit 5b8de72
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 44 deletions.
diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt
@@ -1,13 +1,13 @@
-Total memory consumption was 120142K = 117 MB
+Total memory consumption was 120141K = 117 MB
 
- ---- was used for 2008638 objects, in 361112 frames in 0 x 800K = 0K = 0 MB:
+ ---- was used for 2008634 objects, in 361108 frames in 0 x 800K = 0K = 0 MB:
 
     33.9%  inter_tree_node_array                    58 x 8192 = 475136 objects, 41813824 bytes
     19.8%  text_stream_array                        4340 x 100 = 434000 objects, 24442880 bytes
     19.7%  linked_list                              43320 objects, 24259200 bytes
     11.4%  inter_symbol_array                       132 x 1024 = 135168 objects, 14061696 bytes
     10.7%  inter_error_stash_array                  101 x 1024 = 103424 objects, 13241504 bytes
-     8.4%  parse_node                               129588 objects, 10367040 bytes
+     8.4%  parse_node                               129584 objects, 10366720 bytes
      6.0%  verb_conjugation                         160 objects, 7425280 bytes
      4.5%  parse_node_annotation_array              346 x 500 = 173000 objects, 5547072 bytes
      2.7%  pcalc_prop_array                         25 x 1000 = 25000 objects, 3400800 bytes
@@ -237,7 +237,7 @@ Total memory consumption was 120142K = 117 MB
 
 100.0% was used for memory not allocated for objects:
 
-    57.1%  text stream storage                      70318284 bytes in 451474 claims
+    57.1%  text stream storage                      70318184 bytes in 451472 claims
      3.6%  dictionary storage                       4541952 bytes in 6626 claims
      ----  sorting                                  744 bytes in 3 claims
      5.8%  source text                              7200000 bytes in 3 claims
@@ -246,7 +246,7 @@ Total memory consumption was 120142K = 117 MB
      ----  linguistic stock array                   81920 bytes in 2 claims
      ----  small word set array                     105600 bytes in 22 claims
      3.6%  inter symbols storage                    4518512 bytes in 27941 claims
-    13.6%  inter bytecode storage                   16767656 bytes in 14 claims
+    13.6%  inter bytecode storage                   16767544 bytes in 14 claims
      5.0%  inter links storage                      6222976 bytes in 11 claims
      0.1%  inter tree location list storage         191232 bytes in 32 claims
      1.3%  instance-of-kind counting                1695204 bytes in 1 claim
@@ -255,5 +255,5 @@ Total memory consumption was 120142K = 117 MB
      ----  code generation workspace for objects    1336 bytes in 4 claims
      0.2%  emitter array storage                    280032 bytes in 1997 claims
 
--147.-8% was overhead - -181902728 bytes = -177639K = -173 MB
+-147.-8% was overhead - -181902408 bytes = -177639K = -173 MB
 
diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt
@@ -1,17 +1,17 @@
 100.0% in inform7 run
-     68.8% in compilation to Inter
-         48.8% in //Sequence::undertake_queued_tasks//
-          4.7% in //MajorNodes::pre_pass//
+     68.9% in compilation to Inter
+         48.9% in //Sequence::undertake_queued_tasks//
+          4.6% in //MajorNodes::pre_pass//
           3.3% in //MajorNodes::pass_1//
           1.9% in //ImperativeDefinitions::assess_all//
-          1.6% in //RTPhrasebook::compile_entries//
+          1.7% in //RTPhrasebook::compile_entries//
           1.5% in //RTKindConstructors::compile//
           1.0% in //Sequence::lint_inter//
-          0.6% in //MajorNodes::pass_2//
-          0.6% in //World::stage_V//
+          0.5% in //MajorNodes::pass_2//
+          0.5% in //Sequence::undertake_queued_tasks//
+          0.5% in //World::stage_V//
           0.4% in //ImperativeDefinitions::compile_first_block//
           0.4% in //Sequence::undertake_queued_tasks//
-          0.4% in //Sequence::undertake_queued_tasks//
           0.2% in //CompletionModule::compile//
           0.2% in //RTKindConstructors::compile_permissions//
           0.1% in //InferenceSubjects::emit_all//
@@ -21,17 +21,17 @@
           2.0% not specifically accounted for
      28.4% in running Inter pipeline
          10.3% in step 14/15: generate inform6 -> auto.inf
-          7.8% in step 5/15: load-binary-kits
-          5.6% in step 6/15: make-synoptic-module
+          7.6% in step 5/15: load-binary-kits
+          5.8% in step 6/15: make-synoptic-module
           1.5% in step 9/15: make-identifiers-unique
           0.4% in step 12/15: eliminate-redundant-operations
           0.4% in step 4/15: compile-splats
-          0.3% in step 7/15: shorten-wiring
+          0.4% in step 7/15: shorten-wiring
           0.3% in step 8/15: detect-indirect-calls
           0.2% in step 11/15: eliminate-redundant-labels
           0.1% in step 10/15: reconcile-verbs
           0.1% in step 2/15: parse-insertions
           0.1% in step 3/15: resolve-conditional-compilation
-          0.7% not specifically accounted for
+          0.6% not specifically accounted for
       2.2% in supervisor
       0.4% not specifically accounted for