#include "zypp/ZConfig.h"
#include "zypp/sat/detail/PoolImpl.h"
+#include "zypp/sat/SolvableSet.h"
#include "zypp/sat/Pool.h"
#include "zypp/Capability.h"
#include "zypp/Locale.h"
/////////////////////////////////////////////////////////////////
+ const bool resusePoolIDs = true;
+
const std::string & PoolImpl::systemRepoAlias()
{
static const std::string _val( "@System" );
return _val;
}
-
/////////////////////////////////////////////////////////////////
- static void logSat( struct _Pool *, void *data, int type, const char *logString )
+ static void logSat( CPool *, void *data, int type, const char *logString )
{
if ( type & (SOLV_FATAL|SOLV_ERROR) ) {
- _ERR("libsolv") << logString;
+ L_ERR("libsolv") << logString;
} else if ( type & SOLV_DEBUG_STATS ) {
- _DBG("libsolv") << logString;
+ L_DBG("libsolv") << logString;
} else {
- _MIL("libsolv") << logString;
+ L_MIL("libsolv") << logString;
}
}
- detail::IdType PoolImpl::nsCallback( struct _Pool *, void * data, detail::IdType lhs, detail::IdType rhs )
+ detail::IdType PoolImpl::nsCallback( CPool *, void * data, detail::IdType lhs, detail::IdType rhs )
{
// lhs: the namespace identifier, e.g. NAMESPACE:MODALIAS
// rhs: the value, e.g. pci:v0000104Cd0000840[01]sv*sd*bc*sc*i*
::pool_freewhatprovides( _pool );
}
-
void PoolImpl::prepare() const
{
+ // additional /etc/sysconfig/storage check:
+ static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
+ if ( sysconfigFile.hasChanged() )
+ {
+ _requiredFilesystemsPtr.reset(); // recreated on demand
+ const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
+ }
if ( _watcher.remember( _serial ) )
{
// After repo/solvable add/remove:
}
}
- void PoolImpl::prepareForSolving() const
- {
- // additional /etc/sysconfig/storage check:
- static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
- if ( sysconfigFile.hasChanged() )
- {
- _requiredFilesystemsPtr.reset(); // recreated on demand
- const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
- }
- // finally prepare as usual:
- prepare();
- }
-
///////////////////////////////////////////////////////////////////
- ::_Repo * PoolImpl::_createRepo( const std::string & name_r )
+ CRepo * PoolImpl::_createRepo( const std::string & name_r )
{
setDirty(__FUNCTION__, name_r.c_str() );
- ::_Repo * ret = ::repo_create( _pool, name_r.c_str() );
+ CRepo * ret = ::repo_create( _pool, name_r.c_str() );
if ( ret && name_r == systemRepoAlias() )
::pool_set_installed( _pool, ret );
return ret;
}
- void PoolImpl::_deleteRepo( ::_Repo * repo_r )
+ void PoolImpl::_deleteRepo( CRepo * repo_r )
{
setDirty(__FUNCTION__, repo_r->name );
if ( isSystemRepo( repo_r ) )
_autoinstalled.clear();
eraseRepoInfo( repo_r );
- ::repo_free( repo_r, /*reuseids*/false );
+ ::repo_free( repo_r, resusePoolIDs );
+ if ( resusePoolIDs && !_pool->urepos ) // If the last repo is removed clear the pool to actually reuse all IDs.
+ ::pool_freeallrepos( _pool, resusePoolIDs );
}
- int PoolImpl::_addSolv( ::_Repo * repo_r, FILE * file_r )
+ int PoolImpl::_addSolv( CRepo * repo_r, FILE * file_r )
{
setDirty(__FUNCTION__, repo_r->name );
int ret = ::repo_add_solv( repo_r, file_r, 0 );
return ret;
}
- int PoolImpl::_addHelix( ::_Repo * repo_r, FILE * file_r )
+ int PoolImpl::_addHelix( CRepo * repo_r, FILE * file_r )
{
setDirty(__FUNCTION__, repo_r->name );
int ret = ::repo_add_helix( repo_r, file_r, 0 );
return 0;
}
- void PoolImpl::_postRepoAdd( ::_Repo * repo_r )
+ void PoolImpl::_postRepoAdd( CRepo * repo_r )
{
if ( ! isSystemRepo( repo_r ) )
{
unsigned blockSize = 0;
for ( detail::IdType i = repo_r->start; i < repo_r->end; ++i )
{
- ::_Solvable * s( _pool->solvables + i );
+ CSolvable * s( _pool->solvables + i );
if ( s->repo == repo_r && sysids.find( s->arch ) == sysids.end() )
{
// Remember an unwanted arch entry:
else if ( blockSize )
{
// Free remembered entries
- ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false );
+ ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs );
blockBegin = blockSize = 0;
}
}
if ( blockSize )
{
// Free remembered entries
- ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false );
+ ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs );
blockBegin = blockSize = 0;
}
}
}
- detail::SolvableIdType PoolImpl::_addSolvables( ::_Repo * repo_r, unsigned count_r )
+ detail::SolvableIdType PoolImpl::_addSolvables( CRepo * repo_r, unsigned count_r )
{
setDirty(__FUNCTION__, repo_r->name );
return ::repo_add_solvable_block( repo_r, count_r );
void PoolImpl::setRepoInfo( RepoIdType id_r, const RepoInfo & info_r )
{
- ::_Repo * repo( getRepo( id_r ) );
+ CRepo * repo( getRepo( id_r ) );
if ( repo )
{
bool dirty = false;
}
- static void _getLocaleDeps( Capability cap_r, std::unordered_set<sat::detail::IdType> & store_r )
+ static void _getLocaleDeps( const Capability & cap_r, LocaleSet & store_r )
{
// Collect locales from any 'namespace:language(lang)' dependency
CapDetail detail( cap_r );
case CapDetail::CAP_NAMESPACE:
if ( detail.lhs().id() == NAMESPACE_LANGUAGE )
{
- store_r.insert( detail.rhs().id() );
+ store_r.insert( Locale( IdString(detail.rhs().id()) ) );
}
break;
{
if ( !_availableLocalesPtr )
{
- // Collect any 'namespace:language(ja)' dependencies
- std::unordered_set<sat::detail::IdType> tmp;
- Pool pool( Pool::instance() );
- for_( it, pool.solvablesBegin(), pool.solvablesEnd() )
- {
- Capabilities cap( it->supplements() );
- for_( cit, cap.begin(), cap.end() )
- {
- _getLocaleDeps( *cit, tmp );
+ _availableLocalesPtr.reset( new LocaleSet );
+ LocaleSet & localeSet( *_availableLocalesPtr );
+
+ for ( const Solvable & pi : Pool::instance().solvables() )
+ {
+ for ( const Capability & cap : pi.supplements() )
+ {
+ _getLocaleDeps( cap, localeSet );
}
- }
-#warning immediately build LocaleSet as soon as Loale is an Id based type
- _availableLocalesPtr.reset( new LocaleSet(tmp.size()) );
- for_( it, tmp.begin(), tmp.end() )
- {
- _availableLocalesPtr->insert( Locale( IdString(*it) ) );
- }
+ }
}
return *_availableLocalesPtr;
}
+ ///////////////////////////////////////////////////////////////////
+
void PoolImpl::multiversionListInit() const
{
_multiversionListPtr.reset( new MultiversionList );
MultiversionList & multiversionList( *_multiversionListPtr );
+
+ MultiversionList::size_type size = 0;
+ for ( const std::string & spec : ZConfig::instance().multiversionSpec() )
+ {
+ static const std::string prefix( "provides:" );
+ bool provides = str::hasPrefix( spec, prefix );
- const std::set<std::string> & multiversionSpec( ZConfig::instance().multiversionSpec() );
- for_( it, multiversionSpec.begin(), multiversionSpec.end() )
- {
- static const std::string prefix( "provides:" );
- if ( str::hasPrefix( *it, prefix ) )
- {
- WhatProvides provides( Capability( it->c_str() + prefix.size() ) );
- if ( provides.empty() )
- {
- MIL << "Multiversion install not provided (" << *it << ")" << endl;
- }
- else
- {
- for_( pit, provides.begin(), provides.end() )
- {
- if ( multiversionList.insert( pit->ident() ).second )
- MIL << "Multiversion install " << pit->ident() << " (" << *it << ")" << endl;
- }
- }
- }
- else
- {
- MIL << "Multiversion install " << *it << endl;
- multiversionList.insert( IdString( *it ) );
- }
+ for ( Solvable solv : WhatProvides( Capability( provides ? spec.c_str() + prefix.size() : spec.c_str() ) ) )
+ {
+ if ( provides || solv.ident() == spec )
+ multiversionList.insert( solv );
+ }
+
+ MultiversionList::size_type nsize = multiversionList.size();
+ MIL << "Multiversion install " << spec << ": " << (nsize-size) << " matches" << endl;
+ size = nsize;
}
}
+ void PoolImpl::multiversionSpecChanged()
+ { _multiversionListPtr.reset(); }
+
+ const PoolImpl::MultiversionList & PoolImpl::multiversionList() const
+ {
+ if ( ! _multiversionListPtr )
+ multiversionListInit();
+ return *_multiversionListPtr;
+ }
+
+ bool PoolImpl::isMultiversion( const Solvable & solv_r ) const
+ { return multiversionList().contains( solv_r ); }
+
+ ///////////////////////////////////////////////////////////////////
+
const std::set<std::string> & PoolImpl::requiredFilesystems() const
{
if ( ! _requiredFilesystemsPtr )
projects / platform / upstream / libzypp.git / blobdiff