Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[crash] Support extra merp params #12126

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

Jump to bottom
Merged
alexanderkyte merged 1 commit into from
Jan 2, 2019
Merged

[crash] Support extra merp params #12126

alexanderkyte merged 1 commit into from
Jan 2, 2019

Conversation

@alexanderkyte
Copy link
Contributor

@alexanderkyte alexanderkyte commented Dec 19, 2018 •
edited
Loading

Fixes #11579

@alexanderkyte alexanderkyte mentioned this pull request Dec 19, 2018
Closed
lambdageek
lambdageek reviewed Dec 19, 2018
View reviewed changes
mono/utils/mono-merp.c Outdated
Copy link
Member

@lambdageek lambdageek Dec 19, 2018

Choose a reason for hiding this comment

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

How many annotations are you expecting? This is an O(n) insertion. Could use a GQueue to get constant-time appends.

Copy link
Contributor Author

@alexanderkyte alexanderkyte Dec 19, 2018

Choose a reason for hiding this comment

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

Good catch. I think I'll just prepend to an slist.

Copy link
Contributor Author

@alexanderkyte alexanderkyte Dec 19, 2018

Choose a reason for hiding this comment

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

A queue to me implies that we care about the FIFO behavior. This is going to be immutable after it's installed.

@alexanderkyte alexanderkyte force-pushed the telemetry_blob branch 2 times, most recently from f4a70c5 to 85ad77b Compare December 19, 2018 18:42
@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 19, 2018

@monojenkins build deb with monolite

@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 19, 2018

@monojenkins build failed

@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 21, 2018

Ah, corlib version was bumped.

@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 21, 2018

@monojenkins build deb with monolite

@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 28, 2018

@monojenkins build failed

1 similar comment
@alexanderkyte
Copy link
Contributor Author

alexanderkyte commented Dec 31, 2018

@monojenkins build failed

@alexanderkyte alexanderkyte merged commit 227e711 into mono:master Jan 2, 2019
This was referenced Jan 7, 2019
Closed
Closed
@luhenry
Copy link
Contributor

luhenry commented Jan 11, 2019

@monojenkins backport to 2018-08
@monojenkins backport to 2018-10
@monojenkins backport to 2018-12

@monojenkins
Copy link
Contributor

monojenkins commented Jan 11, 2019

@luhenry backporting to 2018-10 failed, the patch results in conflicts:

Applying: [crash] Support extra merp params
Using index info to reconstruct a base tree...
M	configure.ac
M	mono/metadata/icall-def.h
M	mono/metadata/icall.c
M	mono/utils/mono-merp.c
Falling back to patching base and 3-way merge...
Auto-merging mono/utils/mono-merp.c
Auto-merging mono/metadata/icall.c
CONFLICT (content): Merge conflict in mono/metadata/icall.c
Auto-merging mono/metadata/icall-def.h
CONFLICT (content): Merge conflict in mono/metadata/icall-def.h
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
error: Failed to merge in the changes.
Patch failed at 0001 [crash] Support extra merp params

Please backport manually!

@monojenkins
Copy link
Contributor

monojenkins commented Jan 11, 2019

@luhenry backporting to 2018-08 failed, the patch results in conflicts:

Applying: [crash] Support extra merp params
Using index info to reconstruct a base tree...
M	configure.ac
M	mcs/class/corlib/Mono/Runtime.cs
M	mono/metadata/icall-def.h
M	mono/metadata/icall.c
M	mono/tests/merp-json-valid.cs
M	mono/utils/mono-merp.c
Falling back to patching base and 3-way merge...
Auto-merging mono/utils/mono-merp.c
Auto-merging mono/tests/merp-json-valid.cs
Auto-merging mono/metadata/icall.c
CONFLICT (content): Merge conflict in mono/metadata/icall.c
Auto-merging mono/metadata/icall-def.h
CONFLICT (content): Merge conflict in mono/metadata/icall-def.h
Auto-merging mcs/class/corlib/Mono/Runtime.cs
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
error: Failed to merge in the changes.
Patch failed at 0001 [crash] Support extra merp params

Please backport manually!

@monojenkins
Copy link
Contributor

monojenkins commented Jan 11, 2019

@luhenry backporting to 2018-12 failed, the patch results in conflicts:

Applying: [crash] Support extra merp params
Using index info to reconstruct a base tree...
M	configure.ac
M	mono/metadata/icall-def.h
M	mono/metadata/icall.c
M	mono/utils/mono-merp.c
Falling back to patching base and 3-way merge...
Auto-merging mono/utils/mono-merp.c
Auto-merging mono/metadata/icall.c
Auto-merging mono/metadata/icall-def.h
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
error: Failed to merge in the changes.
Patch failed at 0001 [crash] Support extra merp params

Please backport manually!

This was referenced Jan 22, 2019
Merged
Merged
Merged
marek-safar pushed a commit that referenced this pull request Jan 24, 2019
@alexanderkyte @marek-safar
[2018-12] Native Crash Stability Fix Batch (#12572)
e7b29fc 
This contains the commits from

#12125
#12126
and
#12518
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akoeplinger akoeplinger Awaiting requested review from akoeplinger

@lewurm lewurm Awaiting requested review from lewurm

@luhenry luhenry Awaiting requested review from luhenry

@marek-safar marek-safar Awaiting requested review from marek-safar

@vargaz vargaz Awaiting requested review from vargaz

1 more reviewer

@lambdageek lambdageek lambdageek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alexanderkyte @luhenry @monojenkins @lambdageek