Use websocket (nchan) instead of ajax polling to refresh data in dashboard #28
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,10 +31,6 @@ span.gpu { | |
| display: inline-block; | ||
| } | ||
|
|
||
| .gpu-image { | ||
| padding-left: 8px; | ||
| height: 32px; | ||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #!/usr/bin/php -q | ||
| <?php | ||
| /* | ||
| MIT License | ||
|
|
||
| Copyright (c) 2020-2022 b3rs3rk | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| */ | ||
| ?> | ||
| <?php | ||
| $docroot = '/usr/local/emhttp'; | ||
|
|
||
| const ES = ' '; | ||
|
|
||
| require_once "$docroot/webGui/include/publish.php"; | ||
|
|
||
| require_once __DIR__ . '/../lib/Main.php'; | ||
| require_once __DIR__ . '/../lib/Nvidia.php'; | ||
| require_once __DIR__ . '/../lib/Intel.php'; | ||
| require_once __DIR__ . '/../lib/AMD.php'; | ||
| require_once __DIR__ . '/../lib/Error.php'; | ||
|
|
||
| use gpustat\lib\AMD; | ||
| use gpustat\lib\Main; | ||
| use gpustat\lib\Nvidia; | ||
| use gpustat\lib\Intel; | ||
| use gpustat\lib\Error; | ||
|
|
||
| while (true) { | ||
| $gpustat_cfg = Main::getSettings(); | ||
| $multi = urldecode($gpustat_cfg["MULTIGPUJSON"]); | ||
| $multigpus = json_decode($multi, true); | ||
| $data = array() ; | ||
|
|
||
| foreach ($multigpus as $gpu) { | ||
| $gpustat_cfg["VENDOR"] = $gpu['vendor'] ; | ||
| $gpustat_cfg["GPUID"] = $gpu['guid'] ; | ||
| $gpustat_cfg["PCIID"] = $gpu['id'] ; | ||
|
|
||
| switch ($gpu['vendor']) { | ||
| case 'amd': | ||
| $return = (new AMD($gpustat_cfg))->getStatistics(); | ||
| $decode = json_decode($return, true); | ||
| $data[$gpu["id"]] = $decode; | ||
| break; | ||
| case 'intel': | ||
| $return = (new Intel($gpustat_cfg))->getStatistics(); | ||
| $decode = json_decode($return, true); | ||
| $data[$gpu["id"]] = $decode; | ||
| break; | ||
| case 'nvidia': | ||
| $return = (new Nvidia($gpustat_cfg))->getStatistics() ; | ||
| $decode = json_decode($return, true); | ||
| $data[$gpu["id"]] = $decode; | ||
| break; | ||
| default: | ||
| print_r(Error::get(Error::CONFIG_SETTINGS_NOT_VALID)); | ||
| } | ||
| } | ||
|
|
||
| // Test data | ||
| // $data = array_merge($data, json_decode('{"00:02.0": {"clock": 100, "fan": 50, "memclock": 500, "memutil": 55, "memused": 55, "power": "100W", "powermax": 500, "rxutil": 50, "txutil": 60, "temp": 50, "tempmax": 200, "util": "40%", "vendor": "Intel", "name": "AlderLake-S GT1", "3drender": "50%", "blitter": "50%", "interrupts": 100, "powerutil": "10%", "video": "20%", "videnh": "30%"}, "09:00.0": {"clock": 0, "fan": "N\/A", "memclock": "N\/A", "memutil": "N\/A", "memused": "N\/A", "power": "N\/A", "powermax": "N\/A", "rxutil": "N\/A", "txutil": "N\/A", "temp": "N\/A", "tempmax": "N\/A", "util": "0%", "vendor": "Intel", "name": "DG2 [Arc A770]", "3drender": "0%", "blitter": "0%", "interrupts": 0, "powerutil": "0%", "video": "0%", "videnh": "0%"}, "08:00.0": {"active_apps":[{"name": "plex", "mem": 214, "count": 2}], "clock": "810", "fan": "30%", "memclock": "2808", "memutil": "50%", "memused": "50", "power": "28W", "powermax": "87", "rxutil": 50, "txutil": 60, "temp": "41 \u00b0C", "tempmax": "101 \u00b0C", "util": "77%", "vendor": "NVIDIA", "name": "Quadro K4000", "clockmax": "810", "memclockmax": "2808", "memtotal": "3018", "encutil": "50%", "decutil": "50%", "pciemax": 500, "perfstate": "P0", "throttled": "No", "thrtlrsn": "", "pciegen": 2, "pciegenmax": 2, "pciewidth": 1, "pciewidthmax": 16, "sessions": 2, "uuid": "GPU-ef6c0299-f1bc-7b5c-5291-7cd1a012f8bd"}, "0c:00.0": {"clock": 2110.5, "fan": 200, "memclock": 2220.1, "memutil": "21.2%", "memused": 47.51, "power": 50, "powermax": 200, "rxutil": "N\/A", "txutil": 67, "temp": "38 \u00b0C", "tempmax": 105, "util": "90%", "vendor": "AMD", "name": "Radeon RX 6400\/6500 XT\/6500M", "event": "80%", "vertex": "70%", "texture": "60%", "shaderexp": "50%", "sequencer": "40%", "shaderinter": "30%", "scancon": "30%", "primassem": "30%", "depthblk": "30%", "colorblk": "30%", "gfxtrans": "44.1%", "transused": 11.57, "memclockutil": "9.6%", "clockutil": "21.6%", "tempunit": "C", "fanmax": 5550, "voltage": 77.7, "voltageunit": "V"}}', true)); | ||
|
|
||
| $json = json_encode($data) ; | ||
|
|
||
| publish('gpustat', $json); | ||
|
|
||
| file_put_contents("/tmp/gpujson", "Time = " . date(DATE_RFC2822) . "\n" . $json . "\n") ; | ||
|
|
||
| if ($gpustat_cfg['UIREFRESH'] != '1') { | ||
| exit; | ||
| } | ||
|
|
||
| sleep(round($gpustat_cfg['UIREFRESHINT'] / 1000)); | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be started automatically when you go back to the dashboard so not sure if this is needed. There is a file in var/run called nchan.pid which contains the running nchan processes but would need to confirm the correct way to stop a process.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about it too, but monitor_nchan doesn't restart it if path to gpustat is present in
/var/run/nchan.pid.I didn't find a proper way to stop a nchan process. The only way to stop a process is by adding
:stopin .page header to nchan attribut, but it's only for a single run. Process killed after 30 seconds.I made change to remove process path in nchan.pid and stop process itself if refresh set to No. Dashboard will restart it every time if necessary.
Removed code from GPUStatSettings.page and updated here:
gpustat-unraid/src/gpustat/usr/local/emhttp/plugins/gpustat/nchan/gpustat
Lines 106 to 110 in 563471b