[zypp-commit] r7832 - in /trunk/libzypp: devel/devel.ma/NewPool.cc zypp/sat/Pool.cc zypp/sat/Pool.h zypp/sat/Repo.cc zypp/sat/Repo.h

Author: mlandres Date: Thu Nov 15 19:59:24 2007 New Revision: 7832 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7832&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/zypp/sat/Pool.cc trunk/libzypp/zypp/sat/Pool.h trunk/libzypp/zypp/sat/Repo.cc trunk/libzypp/zypp/sat/Repo.h Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=7832&r1=7831&r2=7832&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Thu Nov 15 19:59:24 2007 @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -396,6 +397,12 @@ } /////////////////////////////////////////////////////////////////// +struct AI +{}; +struct AA +{ + RW_pointer<AI> _impl; +}; /****************************************************************** ** ** FUNCTION NAME : main @@ -408,11 +415,10 @@ zypp::sat::Pool satpool; MIL << satpool << endl; - DBG << satpool.addRepoSolv( "sl10.1-beta7-selections.solv" ) << endl; - MIL << satpool << endl; - DBG << satpool.addRepoSolv( "1234567890.solv" ) << endl; - MIL << satpool << endl; - DBG << satpool.addRepoSolv( "sl10.1-beta7-packages.solv" ) << endl; + std::for_each( satpool.solvablesBegin(), satpool.solvablesEnd(), Print() ); + + satpool.addRepoSolv( "sl10.1-beta7-packages.solv" ); + satpool.addRepoSolv( "sl10.1-beta7-selections.solv" ); MIL << satpool << endl; for_( it, satpool.reposBegin(), satpool.reposEnd() ) @@ -422,10 +428,6 @@ MIL << *sit << endl; } - - satpool.t(); - - /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); Modified: trunk/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.cc?rev=7832&r1=7831&r2=7832&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Pool.cc (original) +++ trunk/libzypp/zypp/sat/Pool.cc Thu Nov 15 19:59:24 2007 @@ -16,6 +16,7 @@ } #include <iostream> +#include "zypp/base/Easy.h" #include "zypp/base/Logger.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" @@ -54,6 +55,9 @@ Pool::~Pool() {} + bool Pool::reposEmpty() const + { return _pool.nrepos; } + unsigned Pool::reposSize() const { return _pool.nrepos; } @@ -64,6 +68,9 @@ { return make_transform_iterator( _pool.repos+_pool.nrepos, detail::mkRepo() ); } + bool Pool::solvablesEmpty() const + { return _pool.nsolvables;} + unsigned Pool::solvablesSize() const { return _pool.nsolvables;} @@ -73,27 +80,34 @@ SolvableIterator Pool::solvablesEnd() const { return SolvableIterator( _pool.solvables+_pool.nsolvables ); } - - Repo Pool::addRepo( const std::string & name_r ) + Repo Pool::reposInsert( const std::string & name_r ) { -#warning Implement name check + Repo ret( reposFind( name_r ) ); + if ( ret ) + return ret; return ::repo_create( &_pool, name_r.c_str() ); } - Repo Pool::addRepoSolv( const Pathname & file_r, const std::string & name_r ) + Repo Pool::reposFind( const std::string & name_r ) const { - Repo repo( addRepo( name_r.empty() ? file_r.basename() : name_r ) ); - try + for_( it, reposBegin(), reposEnd() ) { - repo.addSolv( file_r ); + if ( name_r == it->name() ) + return *it; } - catch ( ... ) - { -#warning use RAII to avoid cleanup catch - ::repo_free( repo.get() ); - throw; - } - return repo; + return Repo(); + } + + Repo Pool::addRepoSolv( const Pathname & file_r, const std::string & name_r ) + { + // Using a temporay repo! (The additional parenthesis are required.) + AutoDispose<Repo> tmprepo( (EraseRepo()) ); + *tmprepo = reposInsert( name_r ); + tmprepo->addSolv( file_r ); + + // no exceptions so we keep it: + tmprepo.resetDispose(); + return tmprepo; } /****************************************************************** Modified: trunk/libzypp/zypp/sat/Pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.h?rev=7832&r1=7831&r2=7832&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Pool.h (original) +++ trunk/libzypp/zypp/sat/Pool.h Thu Nov 15 19:59:24 2007 @@ -15,6 +15,7 @@ #include <iosfwd> #include "zypp/base/PtrTypes.h" +#include "zypp/base/NonCopyable.h" #include "zypp/base/Iterator.h" #include "zypp/AutoDispose.h" @@ -47,27 +48,49 @@ ~Pool(); public: + bool reposEmpty() const; unsigned reposSize() const; RepoIterator reposBegin() const; RepoIterator reposEnd() const; - unsigned solvablesSize() const; - SolvableIterator solvablesBegin() const; - SolvableIterator solvablesEnd() const; - - public: - /** Add new empty \ref Repo named \c name_r. - * \throws Exception if \ref Repo with named \c name_r exists. + /** Return a \ref Repo named \c name_r. + * It a such a \ref Repo does not already exist + * a new empty \ref Repo is created. */ - Repo addRepo( const std::string & name_r ); + Repo reposInsert( const std::string & name_r ); - /** Add new \ref Repo from solv-file. - * \c name_r defaults to the solvfiles basename. - * \throws Exception from \ref Pool::addRepo or \ref Repo::addSolv + /** Find a \ref Repo named \c name_r. + * Returns \ref norepo if there is no such \ref Repo. */ - Repo addRepoSolv( const Pathname & file_r, const std::string & name_r = std::string() ); + Repo reposFind( const std::string & name_r ) const; + + /** Remove a \ref Repo named \c name_r. */ + void reposErase( const std::string & name_r ) + { reposErase( reposFind( name_r ) ); } + /** \overload */ + void reposErase( Repo repo_r ) + { repo_r.eraseFromPool(); } + + public: + /** Functor removing \ref Repo from it's \ref Pool. */ + struct EraseRepo; + + /** Load \ref Solvables from a solv-file into a \ref Repo named \c name_r. + * In case of an exception the \ref Repo is removed from the \ref Pool. + * \throws Exception if loading the solv-file fails. + */ + Repo addRepoSolv( const Pathname & file_r, const std::string & name_r ); + /** \overload Using the files basename as \ref Repo name. */ + Repo addRepoSolv( const Pathname & file_r ) + { return addRepoSolv( file_r, file_r.basename() ); } + + public: + bool solvablesEmpty() const; + unsigned solvablesSize() const; + SolvableIterator solvablesBegin() const; + SolvableIterator solvablesEnd() const; - private: + private: /** Explicitly shared sat-pool. */ AutoDispose< ::_Pool *> _raii; /** Convenient access. */ @@ -77,50 +100,45 @@ /** \relates Pool Stream output */ std::ostream & operator<<( std::ostream & str, const Pool & obj ); -#if 0 + + /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// // - // CLASS NAME : TempRepo + // CLASS NAME : Pool::EraseRepo // - /** Maintain a temporary \ref Repo. - * Any included temporary \ref Repo is removed from the \ref Prool - * upon destruction. This may ease convenient and exception safe - * creation of repos. + /** Functor removing \ref Repo from it's \ref Pool. + * E.g. used as dispose function in. \ref AutoDispose + * to provide a convenient and exception safe temporary + * \ref Repo. * \code - * { - * TempRepo tmp( pool.addRepo( "newrepo" ) ); - * - * // Exceptions when loading Solvables into "newrepo" - * // may bypass, and "newrepo" will be removed from - * // the pool. - * - * if ( keep ) - * { - * // If you decide to keep "newrepo", simply - * // clear TempRepo to prevent removal. - * tmp.reset(); - * } - * } + * sat::Pool satpool; + * MIL << "1 " << satpool << endl; + * { + * AutoDisposesat::Repo tmprepo( (sat::Pool::EraseRepo()) ); + * *tmprepo = satpool.reposInsert( "A" ); + * tmprepo->addSolv( "sl10.1-beta7-packages.solv" ); + * DBG << "2 " << satpool << endl; + * // Calling 'tmprepo.resetDispose();' here + * // would keep the Repo. + * } + * MIL << "3 " << satpool << endl; * \endcode - */ - class TempRepo : private base::NonCopyable + * \code + * 1 sat::pool(){0repos|2slov} + * 2 sat::pool(){1repos|2612slov} + * 3 sat::pool(){0repos|2slov} + * \endcode + * Leaving the block without calling <tt>tmprepo.resetDispose();</tt> + * before, will automatically remove the \ref Repo from it's \ref Pool. + */ + struct Pool::EraseRepo { - public: - TempRepo( const Repo & repo_r ) - : _repo( repo_r ) - {} - - ~TempRepo() - { - if ( _repo ) - _repo. - } - - private: - Repo _repo; + void operator()( Repo repo_r ) const + { repo_r.eraseFromPool(); } }; /////////////////////////////////////////////////////////////////// -#endif + ///////////////////////////////////////////////////////////////// } // namespace sat /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/Repo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Repo.cc?rev=7832&r1=7831&r2=7832&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Repo.cc (original) +++ trunk/libzypp/zypp/sat/Repo.cc Thu Nov 15 19:59:24 2007 @@ -36,12 +36,18 @@ const Repo Repo::norepo( NULL ); - const char * Repo::name() const + std::string Repo::name() const { - if ( ! _repo ) return ""; + if ( ! _repo || ! _repo->name ) return std::string(); return _repo->name; } + bool Repo::solvablesEmpty() const + { + if ( ! _repo ) return true; + return _repo->nsolvables; + } + unsigned Repo::solvablesSize() const { if ( ! _repo ) return 0; @@ -60,15 +66,24 @@ return SolvableIterator( _repo->pool->solvables+_repo->start+_repo->nsolvables ); } + void Repo::eraseFromPool() + { + if ( ! _repo ) return; + ::repo_free( _repo, /*reuseids*/false ); + } + void Repo::addSolv( const Pathname & file_r ) { -#warning add ecxception in repo_add_solv + if ( ! _repo ) + { + ZYPP_THROW( Exception( "Can't add solvables to noepo." ) ); + } + AutoDispose file( ::fopen( file_r.c_str(), "r" ), ::fclose ); if ( file == NULL ) { file.resetDispose(); - throw; - //return Repo(); + ZYPP_THROW( Exception( "Can't read solv-file "+file_r.asString() ) ); } ::repo_add_solv( _repo, file ); @@ -87,6 +102,7 @@ return str << "sat::repo(" << obj.name() << ")" << "{" << obj.solvablesSize() + << ' ' << obj.get()->start << ' ' << obj.get()->end << ' ' << (obj.get()->start < 0 ? "_START_":"") << (obj.get()->nsolvables < 0 ?"_NUMSOLV_":"") <<"}"; Modified: trunk/libzypp/zypp/sat/Repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Repo.h?rev=7832&r1=7831&r2=7832&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Repo.h (original) +++ trunk/libzypp/zypp/sat/Repo.h Thu Nov 15 19:59:24 2007 @@ -54,14 +54,22 @@ public: /** The repos name (alias?). */ - const char * name() const; + std::string name() const; + + bool solvablesEmpty() const; unsigned solvablesSize() const; + SolvableIterator solvablesBegin() const; + SolvableIterator solvablesEnd() const; public: - /** Load Solvables from a solv-file. + /** Remove this \ref Repo from it's \ref Pool. */ + void eraseFromPool(); + + public: + /** Load \ref Solvables from a solv-file. * \throws Exception if loading the solv-file fails. */ void addSolv( const Pathname & file_r ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org