Skip to content

[GEN][ZH] Fix debug vTune ini parsing issue caused by #1231 #1243

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.

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

Closed
wants to merge 1 commit into from

Conversation

Mauller
Copy link

@Mauller Mauller commented Jul 8, 2025

This PR fixes an issue introduced by the previous PR to cleanup RTS internal and profile.

image

The game under debug would not get any further than trying to parse the debug ini data.
Ignoring the assert would not work either and the game would instead hang.

@Mauller Mauller self-assigned this Jul 8, 2025
@Mauller Mauller added Gen Relates to Generals ZH Relates to Zero Hour Debug Is mostly debug functionality ThisProject The issue was introduced by this project, or this task is specific to this project labels Jul 8, 2025
@Mauller Mauller requested a review from xezon July 8, 2025 18:37
@Mauller Mauller changed the title [GEN][ZH] Fix vTune ini parsing issue casued by #1231 [GEN][ZH] Fix vTune ini parsing issue caused by #1231 Jul 8, 2025
@Mauller Mauller changed the title [GEN][ZH] Fix vTune ini parsing issue caused by #1231 [GEN][ZH] Fix debug vTune ini parsing issue caused by #1231 Jul 8, 2025
@roossienb
Copy link

This is missing fixes for CommandLine.cpp and scriptengine.cpp

@Mauller
Copy link
Author

Mauller commented Jul 8, 2025

This is missing fixes for CommandLine.cpp and scriptengine.cpp

This is only to prevent the crash that occurs when using debug, i think the idea is to have vTune used under profile.

@roossienb
Copy link

There are more locations where there are vtune functions, that used to be in debug and internal, and now are just in debug (and not in profile!). Example is the debug block in CommandXlat.cpp starting from line 3849 (it has e.g. vtune stuff in 4994, 5005).

Moving vtune to Profile should not have been done in the INTERNAL removal but in a seperate PR, per my comment #1231 (comment)

I hate it that I didn't stick with my original point and caved in instead.

The move to profile should be undone completely and be re-done, properly and tested, in a separate PR. A search on 'vtune' yields a lot of places in the code doing something. It would not suprise me if vtune doesn't work in profile either, nor will it after this hotpatch.

@Mauller
Copy link
Author

Mauller commented Jul 8, 2025

There are more locations where there are vtune functions, that used to be in debug and internal, and now are just in debug (and not in profile!). Example is the debug block in CommandXlat.cpp starting from line 3849 (it has e.g. vtune stuff in 4994, 5005).

Moving vtune to Profile should not have been done in the INTERNAL removal but in a seperate PR, per my comment #1231 (comment)

I hate it that I didn't stick with my original point and caved in instead.

The move to profile should be undone completely and be re-done, properly and tested, in a separate PR. A search on 'vtune' yields a lot of places in the code doing something. It would not suprise me if vtune doesn't work in profile either, nor will it after this hotpatch.

This hot patch is simply to allow debug builds to work again due to the crashing.

But i understand your point overall.

@aliendroid1
Copy link

There are more locations where there are vtune functions, that used to be in debug and internal, and now are just in debug (and not in profile!). Example is the debug block in CommandXlat.cpp starting from line 3849 (it has e.g. vtune stuff in 4994, 5005).

Moving vtune to Profile should not have been done in the INTERNAL removal but in a seperate PR, per my comment #1231 (comment)

I hate it that I didn't stick with my original point and caved in instead.

Same. Felt pressured to click approve even though I wasn't really satisfied though I did comment in the approval that my approval is on the condition that we remove the vtune stuff later.

@xezon
Copy link

xezon commented Jul 8, 2025

Superseeded by #1245

@xezon xezon closed this Jul 8, 2025
@aliendroid1
Copy link

This is missing fixes for CommandLine.cpp and scriptengine.cpp

This is only to prevent the crash that occurs when using debug, i think the idea is to have vTune used under profile.

No just don't use it at all😭. Remove it all. It's obsolete code (not modern vtune, our code for using the obsolete api)

@Mauller Mauller deleted the fix-vtune-ini-parsing branch July 9, 2025 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Debug Is mostly debug functionality Gen Relates to Generals ThisProject The issue was introduced by this project, or this task is specific to this project ZH Relates to Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants