From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-329216-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q33cM-00071u-87
for garchives@archives.gentoo.org; Fri, 25 Mar 2011 09:47:42 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 439C71C0DA;
Fri, 25 Mar 2011 09:47:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 032B71C0DA
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 09:47:34 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 77E1C1B40C6
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 09:47:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id D1FE88006A
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 09:47:33 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <7ffa0683cd9c40e630488af5783c549bee5cd3c8.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/portage/dbapi/vartree.py
X-VCS-Directories: pym/portage/dbapi/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 7ffa0683cd9c40e630488af5783c549bee5cd3c8
Date: Fri, 25 Mar 2011 09:47:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 7d03877d211d61c9681edba422def6f9
commit: 7ffa0683cd9c40e630488af5783c549bee5cd3c8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 09:47:17 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 09:47:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D7ffa0683
vartree: remove unused scheduler references
Since all the merge code runs inside MergeProcess now, there's no
reason to yield to the scheduler.
---
pym/portage/dbapi/vartree.py | 40 +++++++-----------------------------=
----
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8203de8..4f8c2ee 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -878,7 +878,7 @@ class vardbapi(dbapi):
def populate(self):
self._populate()
=20
- def _populate(self, scheduler=3DNone):
+ def _populate(self):
owners_cache =3D vardbapi._owners_cache(self._vardb)
cached_hashes =3D set()
base_names =3D self._vardb._aux_cache["owners"]["base_names"]
@@ -902,10 +902,6 @@ class vardbapi(dbapi):
=20
# Cache any missing packages.
for cpv in uncached_pkgs:
-
- if scheduler is not None:
- scheduler.scheduleYield()
-
owners_cache.add(cpv)
=20
# Delete any stale cache.
@@ -919,12 +915,12 @@ class vardbapi(dbapi):
=20
return owners_cache
=20
- def get_owners(self, path_iter, scheduler=3DNone):
+ def get_owners(self, path_iter):
"""
@return the owners as a dblink -> set(files) mapping.
"""
owners =3D {}
- for owner, f in self.iter_owners(path_iter, scheduler=3Dscheduler):
+ for owner, f in self.iter_owners(path_iter):
owned_files =3D owners.get(owner)
if owned_files is None:
owned_files =3D set()
@@ -944,7 +940,7 @@ class vardbapi(dbapi):
owner_set.add(pkg_dblink)
return file_owners
=20
- def iter_owners(self, path_iter, scheduler=3DNone):
+ def iter_owners(self, path_iter):
"""
Iterate over tuples of (dblink, path). In order to avoid
consuming too many resources for too much time, resources
@@ -956,7 +952,7 @@ class vardbapi(dbapi):
=20
if not isinstance(path_iter, list):
path_iter =3D list(path_iter)
- owners_cache =3D self._populate(scheduler=3Dscheduler)
+ owners_cache =3D self._populate()
vardb =3D self._vardb
root =3D vardb._eroot
hash_pkg =3D owners_cache._hash_pkg
@@ -1015,23 +1011,19 @@ class vardbapi(dbapi):
if dblink(cpv).isowner(path):
owners.append((cpv, path))
=20
- if scheduler is not None:
- scheduler.scheduleYield()
-
except StopIteration:
path_iter.append(path)
del owners[:]
dblink_cache.clear()
gc.collect()
- for x in self._iter_owners_low_mem(path_iter,
- scheduler=3Dscheduler):
+ for x in self._iter_owners_low_mem(path_iter):
yield x
return
else:
for cpv, p in owners:
yield (dblink(cpv), p)
=20
- def _iter_owners_low_mem(self, path_list, scheduler=3DNone):
+ def _iter_owners_low_mem(self, path_list):
"""
This implemention will make a short-lived dblink instance (and
parse CONTENTS) for every single installed package. This is
@@ -1053,10 +1045,6 @@ class vardbapi(dbapi):
=20
root =3D self._vardb._eroot
for cpv in self._vardb.cpv_all():
-
- if scheduler is not None:
- scheduler.scheduleYield()
-
dblnk =3D self._vardb._dblink(cpv)
=20
for path, name, is_basename in path_info_list:
@@ -1197,10 +1185,6 @@ class dblink(object):
r')$'
)
=20
- # When looping over files for merge/unmerge, temporarily yield to the
- # scheduler each time this many files are processed.
- _file_merge_yield_interval =3D 20
-
def __init__(self, cat, pkg, myroot=3DNone, settings=3DNone, treetype=3D=
None,
vartree=3DNone, blockers=3DNone, scheduler=3DNone, pipe=3DNone):
"""
@@ -2586,7 +2570,6 @@ class dblink(object):
plib_collisions =3D {}
=20
showMessage =3D self._display_merge
- scheduler =3D self._scheduler
stopmerge =3D False
collisions =3D []
destroot =3D self.settings['ROOT']
@@ -2596,10 +2579,6 @@ class dblink(object):
if i % 1000 =3D=3D 0 and i !=3D 0:
showMessage(_("%d files checked ...\n") % i)
=20
- if scheduler is not None and \
- 0 =3D=3D i % self._file_merge_yield_interval:
- scheduler.scheduleYield()
-
dest_path =3D normalize_path(
os.path.join(destroot, f.lstrip(os.path.sep)))
try:
@@ -2708,7 +2687,6 @@ class dblink(object):
os =3D _os_merge
=20
showMessage =3D self._display_merge
- scheduler =3D self._scheduler
=20
file_paths =3D set()
for dblnk in installed_instances:
@@ -2717,10 +2695,6 @@ class dblink(object):
real_paths =3D set()
for i, path in enumerate(file_paths):
=20
- if scheduler is not None and \
- 0 =3D=3D i % self._file_merge_yield_interval:
- scheduler.scheduleYield()
-
if os is _os_merge:
try:
_unicode_encode(path,