Commit 232662f1 authored by Jürg Billeter's avatar Jürg Billeter
Browse files

Merge branch 'juerg/cpucount' into 'master' 

_platform: Fix get_cpu_count() with cap=None

See merge request !840
parents 5d3f039f 14e1a3b3

buildstream/_platform/darwin.py

+4 −3
Original line number Diff line number Diff line
@@ -41,10 +41,11 @@ class Darwin(Platform): 
        return True



    def get_cpu_count(self, cap=None):

        if cap < os.cpu_count():

            return cap

        cpu_count = os.cpu_count()

        if cap is None:

            return cpu_count

        else:

            return os.cpu_count()

            return min(cpu_count, cap)



    def set_resource_limits(self, soft_limit=OPEN_MAX, hard_limit=None):

        super().set_resource_limits(soft_limit)

buildstream/_platform/platform.py

+5 −1
Original line number Diff line number Diff line
@@ -67,7 +67,11 @@ class Platform(): 
        return cls._instance



    def get_cpu_count(self, cap=None):

        return min(len(os.sched_getaffinity(0)), cap)

        cpu_count = len(os.sched_getaffinity(0))

        if cap is None:

            return cpu_count

        else:

            return min(cpu_count, cap)



    ##################################################################

    #                        Sandbox functions                       #