Skip to content

Commit f22ae56

Browse files
committed
Drop _emerge/getloadavg.py
Portage's custom getloadavg.py wrapper was added with 8607a39 ("If necessary, use /proc/loadavg to emulate os.getloadavg()."). All platforms we care about provide os.getloadavg() now, so this can be dropped. Zac did a nice analysis of the historical background in #1383 (comment) to summarize: python on uclibc did not had os.getloadavg() in the past, but uclibc (and uclibc-ng) where retired in gentoo [1]. 1: https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html Signed-off-by: Florian Schmaus <[email protected]>
1 parent 5f6a133 commit f22ae56

File tree

5 files changed

+6
-38
lines changed

5 files changed

+6
-38
lines changed

Diff for: lib/_emerge/JobStatusDisplay.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io
55
import sys
66
import time
7+
import os
78

89
import portage
910
import portage.util.formatter as formatter
@@ -12,8 +13,6 @@
1213
from portage import _unicode_encode
1314
from portage.output import xtermTitle
1415

15-
from _emerge.getloadavg import getloadavg
16-
1716

1817
class JobStatusDisplay:
1918
# Used as maximum display width and default fallback value.
@@ -192,7 +191,7 @@ def _property_change(self, name, old_value, new_value):
192191

193192
def _load_avg_str(self):
194193
try:
195-
avg = getloadavg()
194+
avg = os.getloadavg()
196195
except OSError:
197196
return "unknown"
198197

Diff for: lib/_emerge/PollScheduler.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
# Distributed under the terms of the GNU General Public License v2
33

44
import threading
5+
import os
56

67
from portage.util.futures import asyncio
78
from portage.util._async.SchedulerInterface import SchedulerInterface
89
from portage.util._eventloop.global_event_loop import global_event_loop
910

10-
from _emerge.getloadavg import getloadavg
11-
1211

1312
class PollScheduler:
1413
# max time between loadavg checks (seconds)
@@ -182,7 +181,7 @@ def _can_add_job(self):
182181
and self._running_job_count() >= 1
183182
):
184183
try:
185-
avg1, avg5, avg15 = getloadavg()
184+
avg1, avg5, avg15 = os.getloadavg()
186185
except OSError:
187186
return False
188187

Diff for: lib/_emerge/Scheduler.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import warnings
1313
import weakref
1414
import zlib
15+
import os
1516

1617
import portage
1718
from portage import os
@@ -50,7 +51,6 @@
5051
from _emerge.EbuildPhase import EbuildPhase
5152
from _emerge.emergelog import emergelog
5253
from _emerge.FakeVartree import FakeVartree
53-
from _emerge.getloadavg import getloadavg
5454
from _emerge._find_deep_system_runtime_deps import _find_deep_system_runtime_deps
5555
from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo
5656
from _emerge.JobStatusDisplay import JobStatusDisplay
@@ -1962,7 +1962,7 @@ def _job_delay(self):
19621962
self._sigcont_time = None
19631963

19641964
try:
1965-
avg1, avg5, avg15 = getloadavg()
1965+
avg1, avg5, avg15 = os.getloadavg()
19661966
except OSError:
19671967
return False
19681968

Diff for: lib/_emerge/getloadavg.py

-29
This file was deleted.

Diff for: lib/_emerge/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ py.install_sources(
8181
'create_world_atom.py',
8282
'depgraph.py',
8383
'emergelog.py',
84-
'getloadavg.py',
8584
'help.py',
8685
'is_valid_package_atom.py',
8786
'main.py',

0 commit comments

Comments
 (0)