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.

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

PlatformDefs.h remove _MEMORYSTATUSEX struct #16181

Merged
merged 1 commit into from May 30, 2019
Merged

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented May 21, 2019

More PlatformDefs.h cleanup.

  1. I started by namespacing the three methods in XMemUtils.h and then created a wrapper for these functions for windows.
  2. I removed the windows specific _MEMORYSTATUSEX struct from PlatformDefs.h

I also cleaned up the linux memory method as we don't need to parse /proc/meminfo

I'm not sure if this is the best way (by just creating static methods in a namespace that share a common header) but I didn't see another way.

EDIT: I should also note that each commit builds individual (in sequence) but I only tested this on Linux and I don't expect them to build on windows in the same way. So if it's important to keep the build without breaking for each commit then I can squash them at the end,

@lrusak lrusak added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v19 Matrix labels May 21, 2019
@lrusak lrusak added this to the Matrix 19.0-alpha 1 milestone May 21, 2019
@lrusak lrusak requested review from yol and Rechi May 21, 2019 00:28
Copy link
Member

@yol yol left a comment

Choose a reason for hiding this comment

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

Looking good, but I totally don't get why you kept the length field

xbmc/utils/MemUtils.h Outdated Show resolved Hide resolved
@notspiff
Copy link
Contributor

rebase and squash

@jenkins4kodi jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label May 25, 2019
@jenkins4kodi jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label May 25, 2019
xbmc/guilib/Texture.cpp Outdated Show resolved Hide resolved
xbmc/interfaces/legacy/ModuleXbmc.cpp Outdated Show resolved Hide resolved
xbmc/platform/posix/MemUtils.cpp Outdated Show resolved Hide resolved
xbmc/utils/MemUtils.h Outdated Show resolved Hide resolved
@lrusak
Copy link
Contributor Author

lrusak commented May 28, 2019

any objections?

xbmc/guilib/Texture.h Outdated Show resolved Hide resolved
@lrusak
Copy link
Contributor Author

lrusak commented May 29, 2019

updated

@lrusak lrusak merged commit a169177 into xbmc:master May 30, 2019
@lrusak lrusak deleted the mem-defines branch February 11, 2022 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v19 Matrix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants