[zypp-commit] r8640 - in /branches/tmp/ma/jump_sat/libzypp/zypp: DiskUsageCounter.cc ResPool.h pool/PoolTraits.h sat/SATResolver.cc solver/detail/ResolverUpgrade.cc

Author: mlandres Date: Tue Feb 12 18:31:05 2008 New Revision: 8640 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8640&view=rev Log: pool iterator fixes Modified: branches/tmp/ma/jump_sat/libzypp/zypp/DiskUsageCounter.cc branches/tmp/ma/jump_sat/libzypp/zypp/ResPool.h branches/tmp/ma/jump_sat/libzypp/zypp/pool/PoolTraits.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/DiskUsageCounter.cc?rev=8640&r1=8639&r2=8640&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/DiskUsageCounter.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/DiskUsageCounter.cc Tue Feb 12 18:31:05 2008 @@ -107,10 +107,9 @@ if ( ! (*it)->installOnly() ) { // Item to update -> check the installed ones. - for_( nit, pool_r.byNameBegin((*it)->name()), pool_r.byNameEnd((*it)->name()) ) - { // same name - if ( (*nit)->kind() == (*it)->kind() // same kind - && nit->status().staysInstalled() ) // and unselected installed + for_( nit, pool_r.byIdentBegin( *it ), pool_r.byIdentEnd( *it ) ) + { // same kind and name + if ( nit->status().staysInstalled() ) // and unselected installed { DiskUsage ndu( (*nit)->diskusage() ); if ( ! ndu.empty() ) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ResPool.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/ResPool.h?rev=8640&r1=8639&r2=8640&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ResPool.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ResPool.h Tue Feb 12 18:31:05 2008 @@ -134,6 +134,9 @@ /** Derive name and kind from \ref sat::Solvable. */ byIdent_iterator byIdentBegin( sat::Solvable slv_r ) const { return make_filter_begin( ByIdent(slv_r), *this ); } + /** Takes a \ref sat::Solvable::ident string. */ + byIdent_iterator byIdentBegin( IdString ident_r ) const + { return make_filter_begin( ByIdent(ident_r), *this ); } byIdent_iterator byIdentEnd( ResKind kind_r, IdString name_r ) const @@ -156,6 +159,9 @@ /** Derive name and kind from \ref sat::Solvable. */ byIdent_iterator byIdentEnd( sat::Solvable slv_r ) const { return make_filter_begin( ByIdent(slv_r), *this ); } + /** Takes a \ref sat::Solvable::ident string. */ + byIdent_iterator byIdentEnd( IdString ident_r ) const + { return make_filter_end( ByIdent(ident_r), *this ); } //@} public: Modified: branches/tmp/ma/jump_sat/libzypp/zypp/pool/PoolTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/pool/PoolTraits.h?rev=8640&r1=8639&r2=8640&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/pool/PoolTraits.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/pool/PoolTraits.h Tue Feb 12 18:31:05 2008 @@ -40,14 +40,20 @@ { return pi; } }; - /** Main filter selecting PoolItems bu \c name and \c kind. */ - class ByIdent //: public ResObjectFilterFunctor + /** Main filter selecting PoolItems bu \c name and \c kind. + * + */ + class ByIdent { public: ByIdent( sat::Solvable slv_r ) : _id( makeIdent( slv_r ) ) {} + ByIdent( IdString ident_r ) + : _id( ident_r.id() ) + {} + ByIdent( ResKind kind_r, IdString name_r ) : _id( makeIdent( kind_r, name_r ) ) {} Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc?rev=8640&r1=8639&r2=8640&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc Tue Feb 12 18:31:05 2008 @@ -239,8 +239,7 @@ //------------------------------------------------------------------------------------------------------------ -// This function loops over the pool and grabs -// all item.status().transacts() and item.status().byUser() +// This function loops over the pool and grabs all items // It clears all previous bySolver() states also // // Every toBeInstalled is passed to zypp::solver:detail::Resolver.addPoolItemToInstall() @@ -273,27 +272,15 @@ if (status.isToBeInstalled()) { resolver.addPoolItemToInstall(item); // -> install! } - if (status.isToBeUninstalled()) { + else if (status.isToBeUninstalled()) { resolver.addPoolItemToRemove(item); // -> remove ! } - if (status.isIncomplete()) { // incomplete (re-install needed) - PoolItem reinstall = Helper::findReinstallItem (resolver.pool(), item); - if (reinstall) { - MIL << "Reinstall " << reinstall << " for incomplete " << item << endl; - resolver.addPoolItemToInstall(reinstall); // -> install! - } - else { - WAR << "Can't find " << item << " for re-installation" << endl; - } - } - - if (status.isLocked() - || (status.isKept() - && !by_solver)) { + else if (status.isLocked() + || (status.isKept() + && !by_solver)) { resolver.addPoolItemToLock (item); } - return true; } }; @@ -349,17 +336,8 @@ _items_to_lock.clear(); invokeOnEach ( _pool.begin(), _pool.end(), - resfilter::ByTransact( ), // collect transacts from Pool to resolver queue functor::functorRef(info) ); - invokeOnEach ( _pool.begin(), _pool.end(), - resfilter::ByLock( ), // collect locks from Pool to resolver queue - functor::functorRef(info) ); - - invokeOnEach ( _pool.begin(), _pool.end(), - resfilter::ByKeep( ), // collect keeps from Pool to resolver queue - functor::functorRef(info) ); - for (PoolItemList::const_iterator iter = _items_to_install.begin(); iter != _items_to_install.end(); iter++) { PoolItem r = *iter; @@ -450,10 +428,9 @@ if (poolItem) { // Check if this is an update CheckIfUpdate info; - invokeOnEach( _pool.byNameBegin( poolItem->name() ), - _pool.byNameEnd( poolItem->name() ), - functor::chain (resfilter::ByUninstalled (), // ByUninstalled - resfilter::ByKind( poolItem->kind() ) ), // equal kind + invokeOnEach( _pool.byIdentBegin( poolItem ), + _pool.byIdentEnd( poolItem ), + resfilter::ByUninstalled(), // ByUninstalled functor::functorRef (info) ); if (info.is_updated) { @@ -471,6 +448,7 @@ _solv = NULL; queue_free( &(_jobQueue) ); + MIL << "SATResolver::resolvePool() done" << endl; return true; } @@ -632,12 +610,12 @@ case SOLVER_INSTALL_SOLVABLE_NAME: { FindPackage info (problemSolution, KEEP); - string package_name (id2str(pool, what)); - invokeOnEach( _pool.byNameBegin( package_name ), - _pool.byNameEnd( package_name ), + IdString ident( what ); + invokeOnEach( _pool.byIdentBegin( ident ), + _pool.byIdentEnd( ident ), resfilter::ByUninstalled (), functor::functorRef (info) ); - string description = str::form (_("do not install %s"), id2str(pool, what)); + string description = str::form (_("do not install %s"), ident.c_str() ); MIL << description << endl; problemSolution->addDescription (description); } @@ -645,13 +623,13 @@ case SOLVER_ERASE_SOLVABLE_NAME: { FindPackage info (problemSolution, KEEP); - string package_name (id2str(pool, what)); - invokeOnEach( _pool.byNameBegin( package_name ), - _pool.byNameEnd( package_name ), + IdString ident( what ); + invokeOnEach( _pool.byIdentBegin( ident ), + _pool.byIdentEnd( ident ), functor::chain (resfilter::ByInstalled (), // ByInstalled resfilter::ByTransact ()), // will be deinstalled functor::functorRef (info) ); - string description = str::form (_("keep %s"), id2str(pool, what)); + string description = str::form (_("keep %s"), ident.c_str()); MIL << description << endl; problemSolution->addDescription (description); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=8640&r1=8639&r2=8640&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc Tue Feb 12 18:31:05 2008 @@ -256,7 +256,7 @@ public: bool found; PoolItem candidate; - + LookForSelected (PoolItem can) : found (false), candidate (can) @@ -267,7 +267,7 @@ if (item.status().isToBeInstalled() && item->edition() == candidate->edition() && item->arch() == candidate->arch()) { - MIL << item << " is already selected for installation --> ignoring" << endl; + MIL << item << " is already selected for installation --> ignoring" << endl; found = true; return false; // stop here } @@ -288,7 +288,7 @@ } else { return item.status().setToBeInstalled( ResStatus::APPL_HIGH ); } -} +} //----------------------------------------------------------------------------- @@ -332,7 +332,7 @@ // create a testcase for the updating system Testcase testcase("/var/log/updateTestcase"); - testcase.createTestcase (*this, true, false); // create pool, do not solver + testcase.createTestcase (*this, true, false); // create pool, do not solver _update_items.clear(); { @@ -380,7 +380,6 @@ ++opt_stats_r.pre_nocand; continue; } - MIL << "item " << item << " is installed, candidate is " << candidate << endl; if (candidate.status().isSeen()) { // seen already candidate.status().setSeen(true); continue; @@ -405,12 +404,11 @@ if ( !VendorAttr::instance().equivalent(installed->vendor(), candidate->vendor()) ) { MIL << "Discarding '" << candidate << "' from vendor '" - << candidate->vendor() << "' different to uninstalled '" + << candidate->vendor() << "' different to installed '" << installed->vendor() << "' vendor." << endl; continue; } - MIL << "found installed " << installed << " for item " << candidate << endl; CandidateMap::const_iterator cand_it = candidatemap.find( installed ); if (cand_it == candidatemap.end() // not in map yet || (cand_it->second->arch().compare( candidate->arch() ) < 0) // or the new has better architecture @@ -425,8 +423,6 @@ ++opt_stats_r.pre_avcand; available.insert( candidate ); - - MIL << "installed " << installed << ", candidate " << candidate << endl; } // iterate over the complete pool // reset all seen (for next run) @@ -534,7 +530,7 @@ // Remember new package for 2nd pass. Dep dep (Dep::PROVIDES); - Capability installedCap( installed->name(), Rel::EQ, installed->edition(), installed->kind()); + Capability installedCap( installed->name(), Rel::EQ, installed->edition(), installed->kind()); FindProviders info(installed); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org