@@ -1,13 +1,182 @@

 {

-  "ceph": 83.7,

-  "mesos": 75,

-  "linux": 41.2,

-  "linux-secure": 32,

-  "openjdk8": 21.55,

-  "kubernetes": 21.3,

-  "llvm": 20.267,

-  "linux-esx": 16.73,

-  "falco": 13.85,

-  "guile": 11.52,

-  "clang": 11.3

+  "mongodb": 155,

+  "llvm": 129,

+  "linux": 124,

+  "linux-secure": 115,

+  "linux-aws": 112,

+  "clang": 109,

+  "mysql": 103,

+  "openjdk10": 98,

+  "mariadb": 94,

+  "boost": 82,

+  "nodejs": 63,

+  "envoy": 63,

+  "lldb": 58,

+  "openjdk8": 57,

+  "linux-esx": 56,

+  "kubernetes": 48,

+  "protobuf": 41,

+  "kubernetes": 39,

+  "guile": 25,

+  "elasticsearch": 22,

+  "gdb": 18,

+  "lightwave": 17,

+  "libvirt": 13,

+  "lapack": 12,

+  "sysdig": 9,

+  "ruby": 9,

+  "go": 9,

+  "systemd": 8,

+  "syslog-ng": 8,

+  "xerces-c": 7,

+  "subversion": 7,

+  "python-numpy": 7,

+  "postgresql": 7,

+  "perl": 7,

+  "nss": 7,

+  "kubernetes-dashboard": 7,

+  "go": 7,

+  "gnutls": 7,

+  "glibmm": 7,

+  "gettext": 7,

+  "erlang": 7,

+  "crash": 7,

+  "systemtap": 6,

+  "openvswitch": 6,

+  "likewise-open": 6,

+  "grub2": 6,

+  "python-lxml": 5,

+  "python3": 5,

+  "powershell": 5,

+  "icu": 5,

+  "grpc": 5,

+  "glib": 5,

+  "xfsprogs": 4,

+  "valgrind": 4,

+  "thin-provisioning-tools": 4,

+  "syslinux": 4,

+  "python-gevent": 4,

+  "open-vm-tools": 4,

+  "openssl": 4,

+  "openscap": 4,

+  "net-snmp": 4,

+  "httpd": 4,

+  "git": 4,

+  "docker": 4,

+  "coreutils": 4,

+  "cassandra": 4,

+  "apache-maven": 4,

+  "xml-security-c": 3,

+  "vim": 3,

+  "util-linux": 3,

+  "strongswan": 3,

+  "python2": 3,

+  "mc": 3,

+  "libunistring": 3,

+  "libdb": 3,

+  "krb5": 3,

+  "gperftools": 3,

+  "gobject-introspection": 3,

+  "gobgp": 3,

+  "cython": 3,

+  "cython3": 3,

+  "calico-libnetwork": 3,

+  "calico-felix": 3,

+  "calico-cni": 3,

+  "calico": 3,

+  "cairo": 3,

+  "zsh": 2,

+  "wavefront-proxy": 2,

+  "unixODBC": 2,

+  "unbound": 2,

+  "tclap": 2,

+  "rpm": 2,

+  "openldap": 2,

+  "openipmi": 2,

+  "ntp": 2,

+  "lttng-tools": 2,

+  "libxml2": 2,

+  "libnl": 2,

+  "kubernetes-metrics-server": 2,

+  "kubernetes-dns": 2,

+  "kapacitor": 2,

+  "json_spirit": 2,

+  "ipxe": 2,

+  "influxdb": 2,

+  "heapster": 2,

+  "groff": 2,

+  "gnupg": 2,

+  "elfutils": 2,

+  "coredns": 2,

+  "calico-k8s-policy": 2,

+  "calico-bgp-daemon": 2,

+  "bindutils": 2,

+  "ansible": 2,

+  "zstd": 1,

+  "zeromq": 1,

+  "xorriso": 1,

+  "wget": 1,

+  "userspace-rcu": 1,

+  "trousers": 1,

+  "texinfo": 1,

+  "tcl": 1,

+  "tar": 1,

+  "swig": 1,

+  "sudo": 1,

+  "strace": 1,

+  "sqlite": 1,

+  "slang": 1,

+  "rsyslog": 1,

+  "redis": 1,

+  "rabbitmq-server": 1,

+  "python-Twisted": 1,

+  "python-docutils": 1,

+  "python-cryptography": 1,

+  "python-botocore": 1,

+  "protobuf-c": 1,

+  "pmd": 1,

+  "pixman": 1,

+  "pcre": 1,

+  "parted": 1,

+  "openssh": 1,

+  "ninja-build": 1,

+  "nginx-ingress": 1,

+  "nginx": 1,

+  "mercurial": 1,

+  "man-db": 1,

+  "lvm2": 1,

+  "lttng-ust": 1,

+  "lshw": 1,

+  "log4cpp": 1,

+  "Linux-PAM": 1,

+  "libwebp": 1,

+  "libsoup": 1,

+  "libjpeg-turbo": 1,

+  "libgcrypt": 1,

+  "libarchive": 1,

+  "leveldb": 1,

+  "js": 1,

+  "jna": 1,

+  "ipmitool": 1,

+  "harfbuzz": 1,

+  "haproxy": 1,

+  "gnuplot": 1,

+  "freetype2": 1,

+  "flannel": 1,

+  "findutils": 1,

+  "etcd": 1,

+  "edgex": 1,

+  "dhcp": 1,

+  "cyrus-sasl": 1,

+  "curl": 1,

+  "cppunit": 1,

+  "consul": 1,

+  "cni": 1,

+  "c-ares": 1,

+  "bzr": 1,

+  "autogen": 1,

+  "audit": 1,

+  "apr": 1,

+  "apparmor": 1,

+  "apache-ant": 1

 }

deleted file mode 100644

@@ -1,3 +0,0 @@

-{

-    "mesos": "50"

-}

@@ -5,6 +5,7 @@ from ThreadPool import ThreadPool

 from constants import constants

 from Logger import Logger

 from SpecData import SPECS

+from StringUtils import StringUtils

 class Scheduler(object):

@@ -117,17 +118,28 @@ class Scheduler(object):

         with open(constants.packageWeightsPath, 'r') as weightFile:

             Scheduler.pkgWeights = json.load(weightFile)

+    # A package's weight is an indicator of the time required to build

+    # that package, relative to other packages. These weights do not

+    # take build-time/install-time dependencies into account -- they

+    # are the individual build-times of the respective packages.

+    # Package weights are positive integers, with a default value of 1.

     @staticmethod

     def _getWeight(package):

+	# Package weights are assumed to be independent of package

+	# version (i.e., in the case of multi-version packages such as

+	# Go or Kubernetes, all the versions have the same weight). So

+	# convert packageName-version to packageName before looking up

+	# the package weight.

+        package, _ = StringUtils.splitPackageNameAndVersion(package)

         try:

-            return float(Scheduler.pkgWeights[package])

+            return int(Scheduler.pkgWeights[package]) + 1

         except KeyError:

-            return 0

+            return 1

     @staticmethod

     def _getPriority(package):

         try:

-            return float(Scheduler.priorityMap[package])

+            return int(Scheduler.priorityMap[package])

         except KeyError:

             return 0