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

Jump to bottom

Fix for #54 #55

Merged
merged 4 commits into from
Jan 24, 2024
Merged

Fix for #54 #55

merged 4 commits into from
Jan 24, 2024

Conversation

alamers
Copy link

@alamers alamers commented Jan 15, 2024

  • added support for intel mac power measurements
  • fixed potential missed messages when buffer wasn't fully read (reusing the same buffered reader now)
  • added test cases

added support for intel mac power measurements
9d9f1ca 
fixed potential missed messages when buffer wasn't fully read
added test cases
@alamers alamers mentioned this pull request Jan 15, 2024
Closed
metacosm
metacosm approved these changes Jan 15, 2024
View reviewed changes
Copy link
Contributor

@metacosm metacosm left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM pending actual testing on my system, which I will do tomorrow. The comments could be addressed in a subsequent PR since they are mostly about optimization.

src/main/java/org/noureddine/joularjx/cpu/PowermetricsMacOS.java Show resolved Hide resolved
src/main/java/org/noureddine/joularjx/cpu/PowermetricsMacOS.java Outdated Show resolved Hide resolved
src/main/java/org/noureddine/joularjx/cpu/PowermetricsMacOS.java Outdated Show resolved Hide resolved
src/main/java/org/noureddine/joularjx/cpu/PowermetricsMacOS.java Show resolved Hide resolved
@adelnoureddine
Copy link
Member

Thanks @alamers for the PR and @metacosm for the review. As soon as you're both happy with the code, I'll merge it.
So far so good for me, as long as we support :

  • Intel Mac
  • M1/M2 mac with combined line or without

This was referenced Jan 16, 2024
Closed
Closed
@metacosm
Copy link
Contributor

I'm OK with merging as-is.

replaced m1/m2 test resources from https://github.com/metacosm/power-…
fc40362 
…server/tree/main

moved intel vs m chip parsing to separate functions for performance
added readHeader to detect intel vs m chip
@adelnoureddine
Copy link
Member

Thanks a lot @alamers and @metacosm. This seems to me quite good for me, and I'll merge your PR.

@adelnoureddine adelnoureddine self-assigned this Jan 24, 2024
@adelnoureddine adelnoureddine linked an issue Jan 24, 2024 that may be closed by this pull request
Mac support: Program consumed 0 joules #54
Closed
@adelnoureddine adelnoureddine merged commit 7b2a37a into joular:develop Jan 24, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metacosm metacosm metacosm approved these changes

@adelnoureddine adelnoureddine adelnoureddine approved these changes

Assignees

@adelnoureddine adelnoureddine

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Mac support: Program consumed 0 joules
3 participants
@alamers @adelnoureddine @metacosm