Detect that nvidia display exists in each refresh #1169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for conkyweb canceled.
|
brndnmtthws
requested changes
Oct 13, 2022
src/nvidia.cc
Outdated
|
|
||
| ++s; | ||
| } // namespace | ||
|
|
||
| Display *nvidia_display_setting::get_nvdisplay() { | ||
| if (!nvdisplay.empty()) { | ||
| Display *nvd = XOpenDisplay(nvdisplay.c_str()); |
There was a problem hiding this comment.
I'm not seeing the corresponding calls to XCloseDisplay to release the resources from XOpenDisplay.
Alternatively, you could wrap the pointer in a small struct or class and use RAII to call XCloseDisplay in the destructor.
EDIT: Note that the Lua API code, does close the display, but that is separate.
There was a problem hiding this comment.
Yeah, it was bad I forgot about releasing (I made incorrect assumptions about the XDisplay without checking specs). I updated the code with smart pointer to handle this now.
brndnmtthws
approved these changes
Oct 14, 2022
| XCloseDisplay(dp); | ||
| } | ||
|
|
||
| using unique_display_t = std::unique_ptr<Display, decltype(&close_nvdisplay)>; |
There was a problem hiding this comment.
This is a great way to handle this!
| @@ -366,6 +368,14 @@ struct nvidia_c_string { | |||
| const int MAXNUMGPU = 64; | |||
|
|
|||
| namespace { | |||
|
|
|||
| // Deleter for nv display to use with std::unique_ptr | |||
| void close_nvdisplay(Display * dp) { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Descriptions
I use laptop with dual graphics. The nvidia is used on demand with bumbleebee. Currently if the optirun as not used, the conky will abort due to missing nvidia display (typically :8) or if started when optirun running (nvidia display present) then will crash after the optirun finish due to invalid pointer.
In my change the
XOpenDisplayis call each time when the nvidia desktop is requested. As I have no experience with X server I don't know what impact it might have on the performance.This change should not affect current behaviour in any way.
I tested it with my laptop trying various orders of starting conky, optirun and stoping optirun to find any issues. None found.
This contribution is GPLv3 licensed.