December 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8159 - in /trunk/sat-solver/bindings/ruby/tests: pool.rb solver.rb transaction.rb
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 21:39:39 2007 New Revision: 8159 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8159&view=rev Log: adapt tests to naming Modified: trunk/sat-solver/bindings/ruby/tests/pool.rb trunk/sat-solver/bindings/ruby/tests/solver.rb trunk/sat-solver/bindings/ruby/tests/transaction.rb Modified: trunk/sat-solver/bindings/ruby/tests/pool.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/pool.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/pool.rb Fri Dec 28 21:39:39 2007 @@ -7,6 +7,6 @@ def test_pool pool = SatSolver::Pool.new assert pool - assert pool.repo_count == 0 + assert pool.count_repos == 0 end end Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Fri Dec 28 21:39:39 2007 @@ -14,7 +14,7 @@ transaction = SatSolver::Transaction.new( pool ) transaction.install( "A" ) - transaction.erase( "xorg-x11" ) + transaction.remove( "xorg-x11" ) solver = SatSolver::Solver.new( pool, system ) solver.allow_uninstall = 1 @@ -22,8 +22,8 @@ solver.each_to_install { |s| puts "Install #{s}" } - solver.each_to_erase { |s| - puts "Erase #{s}" + solver.each_to_remove { |s| + puts "Remove #{s}" } end end Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Fri Dec 28 21:39:39 2007 @@ -18,18 +18,18 @@ transaction.install( "foo" ) transaction.install( repo[0] ) transaction.install( SatSolver::Relation.new( pool, "foo", SatSolver::REL_EQ, "42-7" ) ) - transaction.erase( "bar" ) - transaction.erase( repo[1] ) - transaction.erase( SatSolver::Relation.new( pool, "bar", SatSolver::REL_EQ, "42-7" ) ) + transaction.remove( "bar" ) + transaction.remove( repo[1] ) + transaction.remove( SatSolver::Relation.new( pool, "bar", SatSolver::REL_EQ, "42-7" ) ) assert transaction.size == 6 transaction.each { |a| cmd = case a.cmd when SatSolver::INSTALL_SOLVABLE: "install" - when SatSolver::ERASE_SOLVABLE: "erase" - when SatSolver::INSTALL_SOLVABLE_NAME: "install name" - when SatSolver::ERASE_SOLVABLE_NAME: "erase name" - when SatSolver::INSTALL_SOLVABLE_PROVIDES: "install relation" - when SatSolver::ERASE_SOLVABLE_PROVIDES: "erase relation" + when SatSolver::REMOVE_SOLVABLE: "remove" + when SatSolver::INSTALL_SOLVABLE_NAME: "install by name" + when SatSolver::REMOVE_SOLVABLE_NAME: "remove by name" + when SatSolver::INSTALL_SOLVABLE_PROVIDES: "install by relation" + when SatSolver::REMOVE_SOLVABLE_PROVIDES: "remove by relation" else "<NONE>" end puts "#{cmd}: #{pool.idname(a.id)}" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8158 - in /trunk/sat-solver: bindings/satsolver.i examples/ruby/basic.rb
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 21:37:05 2007 New Revision: 8158 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8158&view=rev Log: fix examples/ruby/basic.rb add create_repo, create_transaction and create_solver to Pool rename 'erase' to 'remove', its more natural rename Pool.count_repo to Pool.count_repos Modified: trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/examples/ruby/basic.rb Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Fri Dec 28 21:37:05 2007 @@ -174,6 +174,14 @@ void set_debug( int level ) { pool_setdebuglevel( $self, level ); } + int promoteepoch() + { return $self->promoteepoch; } +#if defined(SWIGRUBY) + %rename( "promoteepoch=" ) set_promoteepoch( int level ); +#endif + void set_promoteepoch( int b ) + { $self->promoteepoch = b; } + void prepare() { pool_createwhatprovides( $self ); } @@ -218,7 +226,10 @@ return repo; } - int repo_count() + Repo *create_repo( const char *name ) + { return repo_create( $self, name ); } + + int count_repos() { return $self->nrepos; } Repo *get_repo( int i ) @@ -326,6 +337,20 @@ return pool->solvables + id; } + /* + * Transaction management + */ + + Transaction *create_transaction() + { return transaction_new( $self ); } + + /* + * Solver management + */ + + Solver* create_solver( Repo *installed ) + { return solver_create( $self, installed ); } + } /*-------------------------------------------------------------*/ @@ -353,6 +378,22 @@ Pool *pool() { return $self->pool; } + void add_solv( FILE *fp ) + { repo_add_solv( $self, fp ); } + + void add_solv( const char *fname ) + { + FILE *fp = fopen( fname, "r"); + if (fp) { + repo_add_solv( $self, fp ); + fclose( fp ); + } + } + + void add_rpmdb( const char *rootdir ) + { repo_add_rpmdb( $self, NULL, rootdir ); } + + #if defined(SWIGRUBY) void each() { @@ -562,11 +603,11 @@ %extend Action { %constant int INSTALL_SOLVABLE = 1; - %constant int ERASE_SOLVABLE = 2; + %constant int REMOVE_SOLVABLE = 2; %constant int INSTALL_SOLVABLE_NAME = 3; - %constant int ERASE_SOLVABLE_NAME = 4; + %constant int REMOVE_SOLVABLE_NAME = 4; %constant int INSTALL_SOLVABLE_PROVIDES = 5; - %constant int ERASE_SOLVABLE_PROVIDES = 6; + %constant int REMOVE_SOLVABLE_PROVIDES = 6; Action( int cmd, Id id ) { return action_new( cmd, id ); } @@ -607,7 +648,7 @@ /* FIXME: check: s->repo->pool == $self->pool */ queue_push( &($self->queue), (s - s->repo->pool->solvables) ); } - void erase( Solvable *s ) + void remove( Solvable *s ) { queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE ); /* FIXME: check: s->repo->pool == $self->pool */ @@ -618,7 +659,7 @@ queue_push( &($self->queue), SOLVER_INSTALL_SOLVABLE_NAME ); queue_push( &($self->queue), str2id( $self->pool, name, 1 )); } - void erase( const char *name ) + void remove( const char *name ) { queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &($self->queue), str2id( $self->pool, name, 1 )); @@ -630,7 +671,7 @@ Reldep *rd = GETRELDEP( rel->pool, rel->id ); queue_push( &($self->queue), rd->name ); } - void erase( const Relation *rel ) + void remove( const Relation *rel ) { queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE_PROVIDES ); /* FIXME: check: rel->pool == $self->pool */ @@ -745,14 +786,14 @@ } } - void each_to_erase() + void each_to_remove() { Id p; Solvable *s; if (!$self->installed) return; - /* solvables to be erased */ + /* solvables to be removed */ FOR_REPO_SOLVABLES($self->installed, p, s) { if ($self->decisionmap[p] >= 0) Modified: trunk/sat-solver/examples/ruby/basic.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/examples/ruby/basic.r… ============================================================================== --- trunk/sat-solver/examples/ruby/basic.rb (original) +++ trunk/sat-solver/examples/ruby/basic.rb Fri Dec 28 21:37:05 2007 @@ -1,5 +1,5 @@ +$: << "../../build/bindings/ruby" require 'satsolver' - include SatSolver pool = Pool.new @@ -7,46 +7,39 @@ #s = pool.add_empty_repo -f = File.open('../../testsuite/data.libzypp/basic-exercises/exercise-20-packages.solv', 'r') s = pool.create_repo('foo'); -s.add_solv(f); +s.add_solv('../../testsuite/data.libzypp/basic-exercises/exercise-20-packages.solv'); -f = File.open('../../testsuite/data.libzypp/basic-exercises/exercise-20-system.solv', 'r') installed = pool.create_repo('system'); -installed.add_solv(f); +installed.add_solv('../../testsuite/data.libzypp/basic-exercises/exercise-20-system.solv'); pool.each_repo do |repo| puts repo.name end -s.each_solvable do |r| +s.each do |r| puts r end -q = Queue.new -puts q.empty? - -r = pool.select_solvable(s, 'G') +r = pool.find('G', s) puts r -# push one command and one resolvable to the queue -q.push(SOLVER_INSTALL_SOLVABLE) -q.push(r) +t = pool.create_transaction +t.install( r ) pool.prepare pool.promoteepoch = 1 -# no packages installed so use add_empty_repo solv = Solver.new(pool, installed) -solv.fixsystem = 0 -solv.updatesystem = 0 -solv.allowdowngrade = 0 -solv.allowuninstall = 0 -solv.noupdateprovide = 0 +solv.fix_system = 0 +solv.update_system = 0 +solv.allow_downgrade = 0 +solv.allow_uninstall = 0 +solv.no_update_provide = 0 # solve the queue -solv.solve(q) +solv.solve(t) #solv.print_decisions -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8157 - /trunk/sat-solver/bindings/ruby/CMakeLists.txt
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 20:59:44 2007 New Revision: 8157 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8157&view=rev Log: fix last checkin Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Fri Dec 28 20:59:44 2007 @@ -1,11 +1,5 @@ ADD_SUBDIRECTORY(tests) -<<<<<<< .mine -======= - -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/tools") - ->>>>>>> .r8155 EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") @@ -28,33 +22,16 @@ DEPENDS ${SWIG_OUTPUT} ) -<<<<<<< .mine SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) ADD_LIBRARY( satsolverx SHARED ${satsolverx_SRCS} ) SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) ADD_DEPENDENCIES( satsolverx glue ) -======= -SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) -ADD_LIBRARY( satsolverx SHARED "${satsolverx_SRCS}" ) -SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) -ADD_DEPENDENCIES( satsolverx glue ) ->>>>>>> .r8155 -<<<<<<< .mine INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) TARGET_LINK_LIBRARIES( satsolverx satsolver ) TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) TARGET_LINK_LIBRARIES( satsolverx ${DB43_LIBRARY} ) -======= -INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES( satsolverx satsolver ) -TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) ->>>>>>> .r8155 -<<<<<<< .mine -INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} )======= INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb COPYONLY ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) ->>>>>>> .r8155 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8156 - in /trunk/sat-solver/bindings/ruby: CMakeLists.txt tests/action.rb tests/loading.rb tests/relation.rb tests/repo.rb tests/rpmdb.rb tests/setup.sh tests/solver.rb tests/transaction.rb
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 15:29:46 2007 New Revision: 8156 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8156&view=rev Log: Fix the pre-xmas mess. Leave the satsolver.rb file for now although it makes keeping different bindings in sync probably harder. Leaving all binding code in SWIGs .i file is a better choice. Added: trunk/sat-solver/bindings/ruby/tests/setup.sh (with props) Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/bindings/ruby/tests/action.rb trunk/sat-solver/bindings/ruby/tests/loading.rb trunk/sat-solver/bindings/ruby/tests/relation.rb trunk/sat-solver/bindings/ruby/tests/repo.rb trunk/sat-solver/bindings/ruby/tests/rpmdb.rb trunk/sat-solver/bindings/ruby/tests/solver.rb trunk/sat-solver/bindings/ruby/tests/transaction.rb Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Fri Dec 28 15:29:46 2007 @@ -1,7 +1,11 @@ ADD_SUBDIRECTORY(tests) +<<<<<<< .mine + +======= INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/tools") +>>>>>>> .r8155 EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") @@ -24,15 +28,33 @@ DEPENDS ${SWIG_OUTPUT} ) +<<<<<<< .mine +SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +ADD_LIBRARY( satsolverx SHARED ${satsolverx_SRCS} ) +SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( satsolverx glue ) +======= SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) ADD_LIBRARY( satsolverx SHARED "${satsolverx_SRCS}" ) SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) ADD_DEPENDENCIES( satsolverx glue ) +>>>>>>> .r8155 +<<<<<<< .mine +INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) +TARGET_LINK_LIBRARIES( satsolverx satsolver ) +TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) +TARGET_LINK_LIBRARIES( satsolverx ${DB43_LIBRARY} ) +======= INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) TARGET_LINK_LIBRARIES( satsolverx satsolver ) TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) +>>>>>>> .r8155 +<<<<<<< .mine +INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} )======= INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb COPYONLY ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) +>>>>>>> .r8155 Modified: trunk/sat-solver/bindings/ruby/tests/action.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/a… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/action.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/action.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Action require 'test/unit' -require 'SatSolver' +require 'satsolver' class ActionTest < Test::Unit::TestCase def test_action Modified: trunk/sat-solver/bindings/ruby/tests/loading.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/l… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/loading.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/loading.rb Fri Dec 28 15:29:46 2007 @@ -4,7 +4,7 @@ class LoadTest < Test::Unit::TestCase def test_loading - require 'SatSolver' + require 'satsolver' assert true end end Modified: trunk/sat-solver/bindings/ruby/tests/relation.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/relation.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/relation.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Relation require 'test/unit' -require 'SatSolver' +require 'satsolver' class SolvableTest < Test::Unit::TestCase def setup Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Repo require 'test/unit' -require 'SatSolver' +require 'satsolver' class RepoTest < Test::Unit::TestCase def test_repo_create Modified: trunk/sat-solver/bindings/ruby/tests/rpmdb.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/rpmdb.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/rpmdb.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test adding rpmdb require 'test/unit' -require 'SatSolver' +require 'satsolver' class RpmdbTest < Test::Unit::TestCase def test_rpmdb Added: trunk/sat-solver/bindings/ruby/tests/setup.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/setup.sh (added) +++ trunk/sat-solver/bindings/ruby/tests/setup.sh Fri Dec 28 15:29:46 2007 @@ -0,0 +1 @@ +export RUBYPATH="../../../build/bindings/ruby" \ No newline at end of file Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Solver require 'test/unit' -require 'SatSolver' +require 'satsolver' class SolverTest < Test::Unit::TestCase def test_solver Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Fri Dec 28 15:29:46 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Transction require 'test/unit' -require 'SatSolver' +require 'satsolver' class TransactionTest < Test::Unit::TestCase def test_transaction -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8155 - in /trunk/sat-solver/bindings: CMakeLists.txt python/ python/CMakeLists.txt
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 14:59:31 2007 New Revision: 8155 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8155&view=rev Log: prepare Python bindings (incomplete) Added: trunk/sat-solver/bindings/python/ trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/CMakeLists.txt Modified: trunk/sat-solver/bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.t… ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Fri Dec 28 14:59:31 2007 @@ -1,5 +1,10 @@ FIND_PACKAGE(Ruby) +#FIND_PACKAGE(Python) IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ADD_SUBDIRECTORY(ruby) -ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) \ No newline at end of file +ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + +#IF (PYTHON_LIBRARY) +# ADD_SUBDIRECTORY(python) +#ENDIF(PYTHON_LIBRARY) Added: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (added) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Fri Dec 28 14:59:31 2007 @@ -0,0 +1,37 @@ +ADD_SUBDIRECTORY(tests) + +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/tools") + +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 'import sys; print sys.path[2]' OUTPUT_VARIABLE PYTHON_LIB_DIR) + +MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") +MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") + +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) +SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/satsolver.i" ) + +ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." + COMMAND ${SWIG_EXECUTABLE} -python -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i + COMMAND ${CMAKE_COMMAND} -E echo "Done." + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i +) + +ADD_CUSTOM_TARGET( glue + DEPENDS ${SWIG_OUTPUT} +) + +SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) +ADD_LIBRARY( satsolverx SHARED "${satsolverx_SRCS}" ) +SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( satsolverx glue ) + +#INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) +TARGET_LINK_LIBRARIES( satsolverx satsolver ) +TARGET_LINK_LIBRARIES( satsolverx ${PYTHON_LIBRARY} ) + +INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${PYTHON_LIB_DIR}/site-packages) +CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.py ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py COPYONLY ) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py DESTINATION ${PYTHON_LIB_DIR}/site-packages ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8154 - /trunk/sat-solver/tools/CMakeLists.txt
by matz＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: matz Date: Fri Dec 28 01:05:04 2007 New Revision: 8154 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8154&view=rev Log: Install content2solv. Modified: trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?… ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Fri Dec 28 01:05:04 2007 @@ -59,6 +59,7 @@ rpmmd2solv rpmdb2solv addstore + content2solv DESTINATION ${BIN_INSTALL_DIR} ) install(PROGRAMS repo2solv.sh DESTINATION ${BIN_INSTALL_DIR} ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8153 - in /trunk/sat-solver: src/attr_store.c src/attr_store_p.h tools/dumpattr.c
by matz＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: matz Date: Fri Dec 28 01:04:38 2007 New Revision: 8153 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8153&view=rev Log: Memory efficient representation of the dirtree (important for unabridged packages.DU). Store and reread the dirtree (in a hacky way, should use the info block). Make dumpattr show the directory names. On disk the same info as in my 10.3 packages.DU (1.4MB, 330 KB gzipped) only takes 146 KB. Modified: trunk/sat-solver/src/attr_store.c trunk/sat-solver/src/attr_store_p.h trunk/sat-solver/tools/dumpattr.c Modified: trunk/sat-solver/src/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.c?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.c (original) +++ trunk/sat-solver/src/attr_store.c Fri Dec 28 01:04:38 2007 @@ -96,6 +96,37 @@ stringpool_init (&s->dirtree.ss, ss_init_strs); } +#if 0 +static void +dir_setup_flatsons (Dirtree *d) +{ + if (d->flatsons) + return; + if (!d->nflatdirs) + return; + d->flatsons = xcalloc (d->nflatdirs, sizeof (d->flatsons[0])); + unsigned firstson = -1; + unsigned i; + for (i = 0; i < d->nflatdirs; i++) + if (d->flatdirs[i] & 1) + /* A node, i.e. potential son. */ + { + if (firstson == -1) + firstson = i; + } + else if (d->flatdirs[i] & 2) + /* An intermediate parent pointer. */ + ; + else + /* The final parent pointer. Remember the first son. */ + { + assert (firstson != -1); + d->flatsons[d->flatdirs[i] >> 2] = firstson; + firstson = -1; + } +} +#endif + static unsigned dir_lookup_1 (Attrstore *s, unsigned dir, const char *name, unsigned insert) { @@ -188,17 +219,30 @@ unsigned dir_parent (Attrstore *s, unsigned dir) { - return s->dirtree.dirs[dir].parent; + if (s->dirtree.dirs) + return s->dirtree.dirs[dir].parent; + /* We have the packed representation. */ + unsigned p; + while ((p = s->dirtree.flatdirs[dir]) & 1) + dir++; + return p >> 2; } void dir2str (Attrstore *s, unsigned dir, char **str, unsigned *len) { unsigned l = 0; - Id ids[s->dirtree.dirstack_size + 1]; + Id ids[256]; unsigned i, ii; - for (i = 0; dir > 1; dir = dir_parent (s, dir), i++) - ids[i] = s->dirtree.dirs[dir].name; + if (s->dirtree.dirs) + for (i = 0; i < 256 && dir > 1; dir = dir_parent (s, dir), i++) + ids[i] = s->dirtree.dirs[dir].name; + else + for (i = 0; i < 256 && dir > 1; dir = dir_parent (s, dir), i++) + { + assert (s->dirtree.flatdirs[dir] & 1); + ids[i] = s->dirtree.flatdirs[dir] >> 1; + } ii = i; l = 1; for (i = 0; i < ii; i++) @@ -787,6 +831,47 @@ return s->nkeys++; } +#define DIR_BLOCK 1023 +#define CACHE_LINE 32 +#define CACHE_LINE_ELEMS (CACHE_LINE / sizeof(unsigned)) + +static void +finalize_dirs_rec (Dirtree *d, unsigned dir) +{ + unsigned c, parent; + if (!d->dirs[dir].child) + return; + parent = d->dirmap[dir]; + assert(parent); + parent--; + for (c = d->dirs[dir].child; c; c = d->dirs[c].sibling) + { + unsigned id = d->dirs[c].name; + if ((d->nflatdirs & (CACHE_LINE_ELEMS - 1)) == CACHE_LINE_ELEMS - 1) + add_elem (d->flatdirs, d->nflatdirs, parent * 4 + 2, DIR_BLOCK); + d->dirmap[c] = d->nflatdirs + 1; + add_elem (d->flatdirs, d->nflatdirs, id * 2 + 1, DIR_BLOCK); + } + add_elem (d->flatdirs, d->nflatdirs, parent * 4, DIR_BLOCK); + for (c = d->dirs[dir].child; c; c = d->dirs[c].sibling) + finalize_dirs_rec (d, c); +} + +static void +finalize_dirtree (Dirtree *d) +{ + if (d->nflatdirs || !d->ndirs) + return; + d->dirmap = calloc (d->ndirs, sizeof (d->dirmap[0])); + d->nflatdirs = 0; + d->flatdirs = 0; + d->flatsons = 0; + d->dirmap[1] = d->nflatdirs + 1; + finalize_dirs_rec (d, 1); + xfree (d->dirs); + d->dirs = 0; +} + void attr_store_pack (Attrstore *s) { @@ -794,6 +879,8 @@ unsigned int old_mem = 0; if (s->packed) return; + finalize_dirtree (&s->dirtree); + s->ent2attr = xcalloc (s->entries, sizeof (s->ent2attr[0])); s->flat_attrs = 0; s->attr_next_free = 0; @@ -802,6 +889,8 @@ s->schemata = 0; s->schemaofs = 0; + Id id_diskusage = str2id (s->pool, "diskusage", 0); + add_num (s->flat_attrs, s->attr_next_free, 0, FLAT_ATTR_BLOCK); add_elem (s->schemata, s->szschemata, 0, SCHEMA_BLOCK); add_elem (s->schemaofs, s->nschemata, 0, SCHEMA_BLOCK); @@ -878,7 +967,14 @@ { const int *il = nv[ofs].v.intlist; int len = *il++; - //add_num (s->flat_attrs, s->attr_next_free, len, FLAT_ATTR_BLOCK); + if (s->dirtree.dirmap + && s->keys[nv[ofs].key].name == id_diskusage) + { + unsigned i; + assert (!(len % 3)); + for (i = 1; i <= len; i += 3) + nv[ofs].v.intlist[i] = s->dirtree.dirmap[nv[ofs].v.intlist[i]] - 1; + } old_mem += 4 * (len + 1); while (len--) { @@ -911,6 +1007,8 @@ old_mem += s->entries * sizeof (s->attrs[0]); free (s->attrs); s->attrs = 0; + xfree (s->dirtree.dirmap); + s->dirtree.dirmap = 0; /* Remove the hashtable too, it will be build on demand in str2localid the next time we call it, which should not happen while in packed mode. */ @@ -1015,6 +1113,7 @@ xfree (s->schemata); s->schemata = 0; s->szschemata = 0; + /* XXX unpack the dirtree */ } static void @@ -1247,6 +1346,28 @@ exit (1); } + /* XXX write the dirtree as info block. */ + write_id (fp, s->dirtree.ndirs); + if (s->dirtree.ndirs) + { + for (i = 1, local_ssize = 0; i < (unsigned)s->dirtree.ss.nstrings; i++) + local_ssize += 1 + strlen (s->dirtree.ss.stringspace + s->dirtree.ss.strings[i]); + + write_u32 (fp, s->dirtree.ss.nstrings); + write_u32 (fp, local_ssize); + for (i = 1; i < (unsigned)s->dirtree.ss.nstrings; i++) + { + const char *str = s->dirtree.ss.stringspace + s->dirtree.ss.strings[i]; + if (fwrite(str, strlen(str) + 1, 1, fp) != 1) + { + perror("write error"); + exit(1); + } + } + write_id (fp, s->dirtree.nflatdirs); + for (i = 0; i < s->dirtree.nflatdirs; i++) + write_id (fp, s->dirtree.flatdirs[i]); + } write_pages (fp, s); } @@ -1483,12 +1604,51 @@ } } +static void +read_stringpool (FILE *fp, Stringpool *ss, unsigned nstrings) +{ + unsigned i; + unsigned local_ssize; + /* Slightly hacky. Our local string pool already contains "<NULL>" and + "". We write out the "" too, so we have to read over it. We write it + out to be compatible with the SOLV file and to not have to introduce + merging and mapping the string IDs. */ + local_ssize = read_u32 (fp) - 1; + char *strsp = (char *)xrealloc(ss->stringspace, ss->sstrings + local_ssize + 1); + Offset *str = (Offset *)xrealloc(ss->strings, nstrings * sizeof(Offset)); + + ss->stringspace = strsp; + ss->strings = str; + strsp += ss->sstrings; + + unsigned char ignore_char = 1; + if (fread(&ignore_char, 1, 1, fp) != 1 + || (local_ssize && fread(strsp, local_ssize, 1, fp) != 1) + || ignore_char != 0) + { + perror ("read error while reading strings"); + exit(1); + } + strsp[local_ssize] = 0; + + /* Don't build hashtable here, it will be built on demand by str2localid + should we call that. */ + + strsp = ss->stringspace; + ss->nstrings = nstrings; + for (i = 0; i < nstrings; i++) + { + str[i] = strsp - ss->stringspace; + strsp += strlen (strsp) + 1; + } + ss->sstrings = strsp - ss->stringspace; +} + Attrstore * attr_store_read (FILE *fp, Pool *pool) { unsigned nentries; unsigned i; - unsigned local_ssize; unsigned nstrings, nschemata; Attrstore *s = new_store (pool); @@ -1520,39 +1680,7 @@ exit (1); } - /* Slightly hacky. Our local string pool already contains "<NULL>" and - "". We write out the "" too, so we have to read over it. We write it - out to be compatible with the SOLV file and to not have to introduce - merging and mapping the string IDs. */ - local_ssize = read_u32 (fp) - 1; - char *strsp = (char *)xrealloc(s->ss.stringspace, s->ss.sstrings + local_ssize + 1); - Offset *str = (Offset *)xrealloc(s->ss.strings, (nstrings) * sizeof(Offset)); - - s->ss.stringspace = strsp; - s->ss.strings = str; - strsp += s->ss.sstrings; - - unsigned char ignore_char = 1; - if (fread(&ignore_char, 1, 1, fp) != 1 - || (local_ssize && fread(strsp, local_ssize, 1, fp) != 1) - || ignore_char != 0) - { - perror ("read error while reading strings"); - exit(1); - } - strsp[local_ssize] = 0; - - /* Don't build hashtable here, it will be built on demand by str2localid - should we call that. */ - - strsp = s->ss.stringspace; - s->ss.nstrings = nstrings; - for (i = 0; i < nstrings; i++) - { - str[i] = strsp - s->ss.stringspace; - strsp += strlen (strsp) + 1; - } - s->ss.sstrings = strsp - s->ss.stringspace; + read_stringpool (fp, &s->ss, nstrings); s->keys = xrealloc (s->keys, ((s->nkeys + KEY_BLOCK) & ~KEY_BLOCK) * sizeof (s->keys[0])); /* s->keys[0] is initialized in new_store. */ @@ -1603,6 +1731,22 @@ exit (1); } + s->dirtree.ndirs = read_id (fp, 0); + if (s->dirtree.ndirs) + { + unsigned ndirs = s->dirtree.ndirs; + setup_dirs (s); + xfree (s->dirtree.dirs); + s->dirtree.dirs = 0; + s->dirtree.ndirs = ndirs; + + nstrings = read_u32 (fp); + read_stringpool (fp, &s->dirtree.ss, nstrings); + s->dirtree.nflatdirs = read_id (fp, 0); + s->dirtree.flatdirs = xmalloc (s->dirtree.nflatdirs * sizeof (s->dirtree.flatdirs[0])); + for (i = 0; i < s->dirtree.nflatdirs; i++) + s->dirtree.flatdirs[i] = read_id (fp, 0); + } read_or_setup_pages (fp, s); s->packed = 1; Modified: trunk/sat-solver/src/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store_p.h?re… ============================================================================== --- trunk/sat-solver/src/attr_store_p.h (original) +++ trunk/sat-solver/src/attr_store_p.h Fri Dec 28 01:04:38 2007 @@ -47,6 +47,18 @@ Id name; } Dir; +typedef struct _Dirtree { + Dir *dirs; + unsigned ndirs; + Stringpool ss; + unsigned *dirstack; + unsigned ndirstack, dirstack_size; + unsigned *flatdirs; + unsigned nflatdirs; + unsigned *flatsons; + unsigned *dirmap; +} Dirtree; + struct _Attrstore { Pool *pool; @@ -65,13 +77,7 @@ Stringpool ss; - struct Dirtree { - Dir *dirs; - unsigned ndirs; - Stringpool ss; - unsigned *dirstack; - unsigned ndirstack, dirstack_size; - } dirtree; + Dirtree dirtree; /* A space efficient in memory representation. It's read-only. */ /* flat_attrs[ent2attr[i]] are the attrs for entity i. */ Modified: trunk/sat-solver/tools/dumpattr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpattr.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpattr.c (original) +++ trunk/sat-solver/tools/dumpattr.c Fri Dec 28 01:04:38 2007 @@ -18,6 +18,38 @@ #include "pool.h" #include "attr_store_p.h" +static Id id_diskusage; + +static void +dump_diskusage (Attrstore *s, const unsigned char *numlist) +{ + char sbuf[1024]; + char *buf = sbuf; + unsigned slen = sizeof (sbuf); + fprintf (stdout, "DU\n"); + while (1) + { + unsigned dirid, filesz, filenum; + int val; + get_num (numlist, val); + dirid = (val & 63) | ((val >> 1) & ~63); + if (!(val & 64)) + break; + get_num (numlist, val); + filesz = (val & 63) | ((val >> 1) & ~63); + if (!(val & 64)) + break; + get_num (numlist, val); + filenum = (val & 63) | ((val >> 1) & ~63); + dir2str (s, dirid, &buf, &slen); + fprintf (stdout, " %s %d %d %d\n", buf, dirid, filesz, filenum); + if (!(val & 64)) + break; + } + if (buf != sbuf) + free (buf); +} + static void dump_attrs (Attrstore *s, unsigned int entry) { @@ -43,19 +75,22 @@ fprintf (stdout, "str %s\n", ai.as_string); break; case TYPE_ATTR_INTLIST: - { - fprintf (stdout, "lint\n "); - while (1) - { - int val; - get_num (ai.as_numlist, val); - fprintf (stdout, " %d", (val & 63) | ((val >> 1) & ~63)); - if (!(val & 64)) - break; - } - fprintf (stdout, "\n"); - break; - } + if (ai.name == id_diskusage) + dump_diskusage (s, ai.as_numlist); + else + { + fprintf (stdout, "lint\n "); + while (1) + { + int val; + get_num (ai.as_numlist, val); + fprintf (stdout, " %d", (val & 63) | ((val >> 1) & ~63)); + if (!(val & 64)) + break; + } + fprintf (stdout, "\n"); + } + break; case TYPE_ATTR_LOCALIDS: { fprintf (stdout, "lids"); @@ -93,6 +128,7 @@ unsigned int i; Pool *pool = pool_create (); Attrstore *s = attr_store_read (stdin, pool); + id_diskusage = str2id (pool, "diskusage", 0); /* For now test the packing code. */ attr_store_unpack (s); attr_store_pack (s); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8152 - /trunk/sat-solver/tools/repo_susetags.c
by matz＠svn.opensuse.org 27 Dec '07

27 Dec '07

Author: matz Date: Thu Dec 27 22:49:26 2007 New Revision: 8152 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8152&view=rev Log: No idea why I had this as intlist. Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Thu Dec 27 22:49:26 2007 @@ -287,7 +287,7 @@ } } if (n != repo->end) - add_attr_intlist_int (attr, entry, id_sourceid, nn - repo->start); + add_attr_int (attr, entry, id_sourceid, nn - repo->start); else { add_attr_localids_id (attr, entry, id_source, str2localid (attr, sp[0], 1)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8151 - /trunk/sat-solver/tools/repo_susetags.c
by matz＠svn.opensuse.org 27 Dec '07

27 Dec '07

Author: matz Date: Thu Dec 27 22:44:04 2007 New Revision: 8151 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8151&view=rev Log: Parse also +Dir:, i.e. the packages.DU file. For now the info is stored simply as an ATTR_INTLIST and the dirtree isn't saved at all. Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Thu Dec 27 22:44:04 2007 @@ -47,6 +47,8 @@ int last_found_source; char **share_with; int nshare; + Id (*dirs)[3]; // dirid, size, nfiles + int ndirs; }; static Id @@ -141,6 +143,7 @@ Attrstore *attr; static Id id_authors; static Id id_description; +static Id id_diskusage; static Id id_downloadsize; static Id id_eula; static Id id_group; @@ -294,6 +297,98 @@ } } +static void +add_dirline (struct parsedata *pd, char *line) +{ + char *sp[6]; + if (split (line, sp, 6) != 5) + return; + if (!(pd->ndirs & 31)) + { + if (pd->dirs) + pd->dirs = realloc (pd->dirs, (pd->ndirs + 32) * sizeof (pd->dirs[0])); + else + pd->dirs = malloc ((pd->ndirs + 32) * sizeof (pd->dirs[0])); + } + long filesz = strtol (sp[1], 0, 0); + filesz += strtol (sp[2], 0, 0); + long filenum = strtol (sp[3], 0, 0); + filenum += strtol (sp[4], 0, 0); + unsigned dirid = dir_lookup (attr, sp[0], 1); + pd->dirs[pd->ndirs][0] = dirid; + pd->dirs[pd->ndirs][1] = filesz; + pd->dirs[pd->ndirs][2] = filenum; + pd->ndirs++; +} + +static int +id3_cmp (const void *v1, const void *v2) +{ + Id *i1 = (Id*)v1; + Id *i2 = (Id*)v2; + return i1[0] - i2[0]; +} + +static void +commit_diskusage (struct parsedata *pd, unsigned entry) +{ + unsigned i; + /* Now sort in dirid order. This ensures that parents come before + their children. */ + if (pd->ndirs > 1) + qsort (pd->dirs, pd->ndirs, sizeof (pd->dirs[0]), id3_cmp); + /* Substract leaf numbers from all parents to make the numbers + non-cumulative. This must be done post-order (i.e. all leafs + adjusted before parents). We ensure this by starting at the end of + the array moving to the start, hence seeing leafs before parents. */ + for (i = pd->ndirs; i--;) + { + unsigned p = dir_parent (attr, pd->dirs[i][0]); + unsigned j = i; + for (; p; p = dir_parent (attr, p)) + { + for (; j--;) + if (pd->dirs[j][0] == p) + break; + if (j < pd->ndirs) + { + if (pd->dirs[j][1] < pd->dirs[i][1]) + pd->dirs[j][1] = 0; + else + pd->dirs[j][1] -= pd->dirs[i][1]; + if (pd->dirs[j][2] < pd->dirs[i][2]) + pd->dirs[j][2] = 0; + else + pd->dirs[j][2] -= pd->dirs[i][2]; + } + else + /* Haven't found this parent in the list, look further if + we maybe find the parents parent. */ + j = i; + } + } +#if 0 + char sbuf[1024]; + char *buf = sbuf; + unsigned slen = sizeof (sbuf); + for (i = 0; i < pd->ndirs; i++) + { + dir2str (attr, pd->dirs[i][0], &buf, &slen); + fprintf (stderr, "have dir %d %d %d %s\n", pd->dirs[i][0], pd->dirs[i][1], pd->dirs[i][2], buf); + } + if (buf != sbuf) + free (buf); +#endif + for (i = 0; i < pd->ndirs; i++) + if (pd->dirs[i][1] || pd->dirs[i][2]) + { + add_attr_intlist_int (attr, entry, id_diskusage, pd->dirs[i][0]); + add_attr_intlist_int (attr, entry, id_diskusage, pd->dirs[i][1]); + add_attr_intlist_int (attr, entry, id_diskusage, pd->dirs[i][2]); + } + pd->ndirs = 0; +} + /* Unfortunately "a"[0] is no constant expression in the C languages, so we need to pass the four characters individually :-/ */ #define CTAG(a,b,c,d) ((unsigned)(((unsigned char)a) << 24) \ @@ -327,6 +422,7 @@ attr = new_store(pool); id_authors = str2id (pool, "authors", 1); id_description = str2id (pool, "description", 1); + id_diskusage = str2id (pool, "diskusage", 1); id_downloadsize = str2id (pool, "downloadsize", 1); id_eula = str2id (pool, "eula", 1); id_group = str2id (pool, "group", 1); @@ -435,6 +531,8 @@ s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); if (s) s->supplements = repo_fix_legacy(repo, s->provides, s->supplements); + if (s && pd.ndirs) + commit_diskusage (&pd, last_found_pack); pd.kind = 0; if (line[3] == 't') pd.kind = "pattern"; @@ -454,10 +552,13 @@ s->vendor = vendor; continue; } - if (indesc == 2 + if (indesc >= 2 && (tag == CTAG('=', 'P', 'k', 'g') || tag == CTAG('=', 'P', 'a', 't'))) { + if (s && pd.ndirs) + commit_diskusage (&pd, last_found_pack); + Id name, evr, arch; int n, nn; pd.kind = 0; @@ -613,6 +714,9 @@ } pd.share_with[last_found_pack] = strdup (line + 6); continue; + case CTAG('=', 'D', 'i', 'r'): + add_dirline (&pd, line + 6); + continue; case CTAG('=', 'V', 'e', 'r'): last_found_pack = 0; indesc++; @@ -623,6 +727,8 @@ s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); if (s) s->supplements = repo_fix_legacy(repo, s->provides, s->supplements); + if (s && pd.ndirs) + commit_diskusage (&pd, last_found_pack); if (pd.sources) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8150 - in /trunk/sat-solver: src/attr_store.c src/attr_store_p.h src/repo_solv.c tools/dumpattr.c tools/dumpsolv.c
by matz＠svn.opensuse.org 27 Dec '07

27 Dec '07

Author: matz Date: Thu Dec 27 22:39:00 2007 New Revision: 8150 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8150&view=rev Log: Enable ATTR_INTLIST to contain zeros. Use the same encoding as IDARRAY. Modified: trunk/sat-solver/src/attr_store.c trunk/sat-solver/src/attr_store_p.h trunk/sat-solver/src/repo_solv.c trunk/sat-solver/tools/dumpattr.c trunk/sat-solver/tools/dumpsolv.c Modified: trunk/sat-solver/src/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.c?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.c (original) +++ trunk/sat-solver/src/attr_store.c Thu Dec 27 22:39:00 2007 @@ -369,24 +369,19 @@ add_attr_intlist_int (Attrstore *s, unsigned int entry, Id name, int val) { LongNV *nv = find_attr (s, entry, name); - if (val == 0) - return; if (nv) { - unsigned len = 0; - while (nv->v.intlist[len]) - len++; + unsigned len = nv->v.intlist[0]++; nv->v.intlist = realloc (nv->v.intlist, (len + 2) * sizeof (nv->v.intlist[0])); - nv->v.intlist[len] = val; - nv->v.intlist[len+1] = 0; + nv->v.intlist[len+1] = val; } else { LongNV mynv; mynv.key = add_key (s, name, TYPE_ATTR_INTLIST, 0); mynv.v.intlist = malloc (2 * sizeof (mynv.v.intlist[0])); - mynv.v.intlist[0] = val; - mynv.v.intlist[1] = 0; + mynv.v.intlist[0] = 1; + mynv.v.intlist[1] = val; add_attr (s, entry, mynv); } } @@ -437,9 +432,9 @@ { case TYPE_ATTR_INTLIST: { - unsigned len = 0; - while (nv->v.intlist[len]) - add_attr_intlist_int (s, dest, s->keys[nv->key].name, nv->v.intlist[len++]); + unsigned i, len = nv->v.intlist[0]; + for (i = 0; i < len; i++) + add_attr_intlist_int (s, dest, s->keys[nv->key].name, nv->v.intlist[i + 1]); } break; case TYPE_ATTR_LOCALIDS: @@ -523,10 +518,11 @@ } break; case TYPE_ATTR_INTLIST: - { - unsigned i; - while ((i = read_id(fp, 0)) != 0) - add_attr_intlist_int (s, entry, name, i); + { + int i; + while ((i = read_id(fp, 0)) & 64) + add_attr_intlist_int (s, entry, name, (i & 63) | ((i >> 1) & ~63)); + add_attr_intlist_int (s, entry, name, (i & 63) | ((i >> 1) & ~63)); } break; case TYPE_ATTR_LOCALIDS: @@ -881,11 +877,18 @@ case TYPE_ATTR_INTLIST: { const int *il = nv[ofs].v.intlist; - int i; - for (; (i = *il) != 0; il++, old_mem += 4) - add_num (s->flat_attrs, s->attr_next_free, i, FLAT_ATTR_BLOCK); - add_num (s->flat_attrs, s->attr_next_free, 0, FLAT_ATTR_BLOCK); - old_mem+=4; + int len = *il++; + //add_num (s->flat_attrs, s->attr_next_free, len, FLAT_ATTR_BLOCK); + old_mem += 4 * (len + 1); + while (len--) + { + int i = *il++; + if (i >= 64) + i = (i & 63) | ((i & ~63) << 1); + if (len) + i |= 64; + add_num (s->flat_attrs, s->attr_next_free, i, FLAT_ATTR_BLOCK); + } xfree (nv[ofs].v.intlist); break; } @@ -974,9 +977,9 @@ { int val; get_num (ai.as_numlist, val); - if (!val) + add_attr_intlist_int (s, i, ai.name, (val & 63) | ((val >> 1) & ~63)); + if (!(val & 64)) break; - add_attr_intlist_int (s, i, ai.name, val); } break; } Modified: trunk/sat-solver/src/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store_p.h?re… ============================================================================== --- trunk/sat-solver/src/attr_store_p.h (original) +++ trunk/sat-solver/src/attr_store_p.h Thu Dec 27 22:39:00 2007 @@ -179,12 +179,12 @@ } case TYPE_ATTR_INTLIST: { - ai->as_numlist = ai->attrs_next; + ai->as_numlist = ai->attrs_next; while (1) { int val; get_num (ai->attrs_next, val); - if (!val) + if (!(val & 64)) break; } break; Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=8… ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Thu Dec 27 22:39:00 2007 @@ -269,6 +269,7 @@ case TYPE_IDVALUEARRAY: case TYPE_IDVALUEVALUEARRAY: case TYPE_REL_IDARRAY: + case TYPE_ATTR_INTLIST: while ((read_u8(data) & 0xc0) != 0) ; break; @@ -297,7 +298,6 @@ case TYPE_ATTR_INT: read_id(data, 0); break; - case TYPE_ATTR_INTLIST: case TYPE_ATTR_LOCALIDS: while (read_id(data, 0) != 0) ; Modified: trunk/sat-solver/tools/dumpattr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpattr.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpattr.c (original) +++ trunk/sat-solver/tools/dumpattr.c Thu Dec 27 22:39:00 2007 @@ -49,9 +49,9 @@ { int val; get_num (ai.as_numlist, val); - if (!val) + fprintf (stdout, " %d", (val & 63) | ((val >> 1) & ~63)); + if (!(val & 64)) break; - fprintf (stdout, " %d", val); } fprintf (stdout, "\n"); break; Modified: trunk/sat-solver/tools/dumpsolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpsolv.c?rev=… ============================================================================== --- trunk/sat-solver/tools/dumpsolv.c (original) +++ trunk/sat-solver/tools/dumpsolv.c Thu Dec 27 22:39:00 2007 @@ -46,9 +46,9 @@ { int val; get_num (ai.as_numlist, val); - if (!val) + fprintf (stdout, " %d", (val & 63) | ((val >> 1) & ~63)); + if (!(val & 64)) break; - fprintf (stdout, " %d", val); } fprintf (stdout, "\n"); break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0