Author: jreidinger
Date: Tue Apr 15 14:07:28 2008
New Revision: 9648
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9648&view=rev
Log:
add more logging info to locks
Modified:
trunk/libzypp/zypp/Locks.cc
Modified: trunk/libzypp/zypp/Locks.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.cc?rev=9648&r1=9647&r2=9648&view=diff
==============================================================================
--- trunk/libzypp/zypp/Locks.cc (original)
+++ trunk/libzypp/zypp/Locks.cc Tue Apr 15 14:07:28 2008
@@ -100,6 +100,7 @@
void Locks::readAndApply( const Pathname& file )
{
+ MIL << "read and apply locks from "<locks,
_pimpl->locks.end() );
LockingOutputIterator lout(ii);
@@ -108,19 +109,22 @@
void Locks::read( const Pathname& file )
{
+ MIL << "read locks from "<locks, _pimpl->locks.end()) );
}
void Locks::apply()
-{
+{
+ DBG << "apply locks" << endl;
for_each(begin(), end(), ApplyLock());
}
void Locks::addLock( const PoolQuery& query )
{
+ MIL << "add new lock" << endl;
for_( it,query.begin(),query.end() )
{
PoolItem item(*it);
@@ -147,11 +151,13 @@
q.addKind( selectable.kind() );
q.setMatchExact();
q.setCaseSensitive(true);
+ DBG << "add lock by selectactable" << endl;
addLock( q );
}
void Locks::removeLock( const PoolQuery& query )
{
+ MIL << "remove lock" << endl;
for_( it,query.begin(),query.end() )
{
PoolItem item(*it);
@@ -180,6 +186,7 @@
q.setMatchExact();
q.setCaseSensitive(true);
q.requireAll();
+ DBG << "remove lock by selectactable" << endl;
removeLock(q);
}
@@ -243,6 +250,7 @@
void Locks::removeEmpty()
{
+ MIL << "cleaning of locks" << endl;
callback::SendReport<CleanEmptyLocksReport> report;
report->start();
size_t sum = _pimpl->locks.size();
@@ -252,6 +260,7 @@
if( p.aborted() )
{
+ MIL << "cleaning aborted" << endl;
report->finish(CleanEmptyLocksReport::ABORTED);
}
else
@@ -316,6 +325,7 @@
default:
return true;
}
+ MIL << "find conflict: " << cs << endl;
switch (report->conflict(q,cs))
{
case SavingLocksReport::ABORT:
@@ -338,6 +348,8 @@
bool Locks::Impl::mergeList(callback::SendReport<SavingLocksReport>& report)
{
+ MIL << "merging list old: " << locks.size()
+ << " to add: " << toAdd.size() << "to remove: " << toRemove.size() << endl;
for_(it,toRemove.begin(),toRemove.end())
{
std::setsat::Solvable s(it->begin(),it->end());
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
