Bug 181543 – Rename MarkedAllocator to BlockDirectory and AllocatorAttributes to CellAttributes

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Filip Pizlo]

In a world that has thread-local caches, the thing we now call the "MarkedAllocator" doesn't really have anything to do with allocation anymore.  The allocation will be done by something in the TLC.  When you move the allocation logic out of MarkedAllocator, it becomes just a place to find blocks (a "block directory").

Once we do that renaming, the term "allocator attributes" becomes weird. Those are really the attributes of the HeapCellType.  So let's call them CellAttributes.

[Filip Pizlo]

Created attachment 331067 [details]
work in progress

[Filip Pizlo]

Created attachment 331119 [details]
the patch

[Michael Saboff]

Comment on attachment 331119 [details]
the patch

rs=me

[EWS Watchlist]

Attachment 331119 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/heap/IsoSubspace.cpp:30:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:33:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:158:  More than one command on the same line  [whitespace/newline] [4]
ERROR: Source/JavaScriptCore/heap/CompleteSubspace.cpp:30:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/MarkedSpace.cpp:28:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/Subspace.cpp:32:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/SubspaceInlines.h:29:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/IsoSubspace.h:45:  The parameter name "size" adds no information, so it should be removed.  [readability/parameter_name] [5]
ERROR: Source/JavaScriptCore/heap/MarkedSpace.h:26:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h:40:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/MarkedBlock.cpp:34:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/MarkedBlockInlines.h:29:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/BlockDirectory.h:118:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/JavaScriptCore/heap/Heap.cpp:58:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/JavaScriptCore/heap/BlockDirectoryInlines.h:28:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 15 in 51 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Mark Lam]

(In reply to Build Bot from comment #4)
> Attachment 331119 [details] did not pass style-queue:
> 
> 
> ERROR: Source/JavaScriptCore/heap/IsoSubspace.cpp:30:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:33:  Alphabetical
> sorting problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:158:  More than one
> command on the same line  [whitespace/newline] [4]
> ERROR: Source/JavaScriptCore/heap/CompleteSubspace.cpp:30:  Alphabetical
> sorting problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/MarkedSpace.cpp:28:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/Subspace.cpp:32:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/SubspaceInlines.h:29:  Alphabetical
> sorting problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/IsoSubspace.h:45:  The parameter name
> "size" adds no information, so it should be removed. 
> [readability/parameter_name] [5]
> ERROR: Source/JavaScriptCore/heap/MarkedSpace.h:26:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h:40:  Alphabetical
> sorting problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/MarkedBlock.cpp:34:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/MarkedBlockInlines.h:29:  Alphabetical
> sorting problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/BlockDirectory.h:118:  Weird number of
> spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent]
> [3]
> ERROR: Source/JavaScriptCore/heap/Heap.cpp:58:  Alphabetical sorting
> problem.  [build/include_order] [4]
> ERROR: Source/JavaScriptCore/heap/BlockDirectoryInlines.h:28:  Alphabetical
> sorting problem.  [build/include_order] [4]
> Total errors found: 15 in 51 files
> 
> 
> If any of these errors are false positives, please file a bug against
> check-webkit-style.

I think you can fix these.  Just need to reorder the #includes since the filenames have changed.

[Filip Pizlo]

Created attachment 331121 [details]
fix style issues

[EWS Watchlist]

Attachment 331121 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:158:  More than one command on the same line  [whitespace/newline] [4]
Total errors found: 1 in 51 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Filip Pizlo]

(In reply to Build Bot from comment #7)
> Attachment 331121 [details] did not pass style-queue:
> 
> 
> ERROR: Source/JavaScriptCore/heap/BlockDirectory.cpp:158:  More than one
> command on the same line  [whitespace/newline] [4]
> Total errors found: 1 in 51 files
> 
> 
> If any of these errors are false positives, please file a bug against
> check-webkit-style.

I fixed this too.

[Filip Pizlo]

Created attachment 331122 [details]
fix webcore

[EWS Watchlist]

Attachment 331122 [details] did not pass style-queue:


ERROR: Source/WebCore/ForwardingHeaders/heap/BlockDirectoryInlines.h:0:  No copyright message found.  You should have a line: "Copyright [year] <Copyright Owner>"  [legal/copyright] [5]
Total errors found: 1 in 54 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Filip Pizlo]

Landed in https://trac.webkit.org/changeset/226822/webkit

[Radar WebKit Bug Importer]

<rdar://problem/36453802>