Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix out of bounds bug #10

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Fix out of bounds bug #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64c201a
Fix out of bounds bug
matburnx Jun 26, 2024
83bf425
Merge branch 'Alamvic:main' into -Last-entry-with-0%-go-out-of-bounds
matburnx Jun 27, 2024
863cf5f
Added tests
matburnx Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/PerfTreeParser-Tests/PerfTreeParserTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ PerfTreeParserTest >> setUp [
| |
| --36.46%--ext4_file_read_iter
| |
'].
0.00% 0.00% sh [kernel.kallsyms] [k] ghes_notify_nmi
0.00% 0.00% sh [kernel.kallsyms] [k] nmi_cpu_backtrace'].

memoryFS / ('perf_stock_multiple_children.txt') writeStreamDo: [:stream | stream nextPutAll: '# ========
# captured on : Wed May 29 09:28:58 2024
Expand Down Expand Up @@ -347,7 +348,7 @@ PerfTreeParserTest >> testHardestCall [
samePercentageTraces := testNodeSamePercentage traces.
samePercentageTree := PerfTreeTree new traces: samePercentageTraces.

self assert: multipleChildrenTree hardestCall name equals: '__x64_sys_read'.
self assert: multipleChildrenTree hardestCall name equals: '__x64_sys_read (inlined)'.

self assert: samePercentageTree hardestCall name equals: 'ext4_file_read_iter'
]
Expand Down Expand Up @@ -496,6 +497,19 @@ PerfTreeParserTest >> testRealPercentageOf [
equals: 0.0
]

{ #category : 'tests' }
PerfTreeParserTest >> testSmallTrees [

| lastTree beforeTheLastTree |
lastTree := (PerfTreeParser parseFile: fileSamePercentage) last.
beforeTheLastTree := (PerfTreeParser parseFile: fileSamePercentage) second.

self assert: beforeTheLastTree children isEmpty.
self assert: lastTree children isEmpty.


]

{ #category : 'tests' }
PerfTreeParserTest >> testTime [

Expand Down
12 changes: 8 additions & 4 deletions src/PerfTreeParser/PerfTreeParser.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ PerfTreeParser >> findChildrenIndexOfIndex: aNodeIndex [
lastNodeIndex := self numberOfFunctions.
everyChildren := OrderedCollection new.

(self percentageOf: aNodeIndex) = (self percentageOf: aNodeIndex + 1)
ifTrue: [
everyChildren add: aNodeIndex + 1.
^ everyChildren ].
(aNodeIndex + 1 between: 1 and: self numberOfFunctions) ifFalse: [
^ everyChildren ].

((self percentageOf: aNodeIndex)
= (self percentageOf: aNodeIndex + 1) and: [
((self readLine: aNodeIndex + 1) findString: '[') = 0 ]) ifTrue: [
everyChildren add: aNodeIndex + 1.
^ everyChildren ].
Comment on lines +76 to +80
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should sit and pair a bit on this code ^^


newBranch := false.
nodeSpaces := self numberOfSpacesAt: aNodeIndex.
Expand Down