June 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - move some debug statements from STATS to SOLVER
by Michael Schroeder 17 Jun '09

17 Jun '09

ref: refs/heads/master commit b6b7231600b6e10c84afc381e4a601e6661229d8 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 17 17:00:43 2009 +0200 - move some debug statements from STATS to SOLVER --- src/pool.c | 2 +- src/pool.h | 2 ++ src/solver.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/pool.c b/src/pool.c index 56d5747..73fc1c2 100644 --- a/src/pool.c +++ b/src/pool.c @@ -749,7 +749,7 @@ pool_setdebuglevel(Pool *pool, int level) { int mask = SAT_DEBUG_RESULT; if (level > 0) - mask |= SAT_DEBUG_STATS|SAT_DEBUG_ANALYZE|SAT_DEBUG_UNSOLVABLE; + mask |= SAT_DEBUG_STATS|SAT_DEBUG_ANALYZE|SAT_DEBUG_UNSOLVABLE|SAT_DEBUG_SOLVER|SAT_DEBUG_TRANSACTION; if (level > 1) mask |= SAT_DEBUG_JOB|SAT_DEBUG_SOLUTIONS|SAT_DEBUG_POLICY; if (level > 2) diff --git a/src/pool.h b/src/pool.h index e9959ee..2e657ad 100644 --- a/src/pool.h +++ b/src/pool.h @@ -132,6 +132,8 @@ struct _Pool { #define SAT_DEBUG_RESULT (1<<10) #define SAT_DEBUG_JOB (1<<11) #define SAT_DEBUG_SCHUBI (1<<12) +#define SAT_DEBUG_SOLVER (1<<13) +#define SAT_DEBUG_TRANSACTION (1<<14) //----------------------------------------------- diff --git a/src/solver.c b/src/solver.c index 132f7f4..dc1b229 100644 --- a/src/solver.c +++ b/src/solver.c @@ -1331,7 +1331,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) solver_printruleclass(solv, SAT_DEBUG_RULE_CREATION, solv->rules + i); } - POOL_DEBUG(SAT_DEBUG_STATS, "initial decisions: %d\n", solv->decisionq.count); + POOL_DEBUG(SAT_DEBUG_SOLVER, "initial decisions: %d\n", solv->decisionq.count); IF_POOLDEBUG (SAT_DEBUG_SCHUBI) solver_printdecisions(solv); @@ -1377,7 +1377,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) if (level < systemlevel) { - POOL_DEBUG(SAT_DEBUG_STATS, "resolving job rules\n"); + POOL_DEBUG(SAT_DEBUG_SOLVER, "resolving job rules\n"); for (i = solv->jobrules, r = solv->rules + i; i < solv->jobrules_end; i++, r++) { Id l; @@ -1892,7 +1892,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) int installedone = 0; /* let's see if we can install some unsupported package */ - POOL_DEBUG(SAT_DEBUG_STATS, "deciding unsupported packages\n"); + POOL_DEBUG(SAT_DEBUG_SOLVER, "deciding unsupported packages\n"); for (i = 0; i < solv->orphaned.count; i++) { p = solv->orphaned.elements[i]; @@ -1901,12 +1901,12 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) olevel = level; if (solv->distupgrade_removeunsupported) { - POOL_DEBUG(SAT_DEBUG_STATS, "removing unsupported %s\n", solvid2str(pool, p)); + POOL_DEBUG(SAT_DEBUG_SOLVER, "removing unsupported %s\n", solvid2str(pool, p)); level = setpropagatelearn(solv, level, -p, 0, 0); } else { - POOL_DEBUG(SAT_DEBUG_STATS, "keeping unsupported %s\n", solvid2str(pool, p)); + POOL_DEBUG(SAT_DEBUG_SOLVER, "keeping unsupported %s\n", solvid2str(pool, p)); level = setpropagatelearn(solv, level, p, 0, 0); installedone = 1; } @@ -1930,7 +1930,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) if (solv->branches.elements[i - 1] < 0) break; p = solv->branches.elements[i]; - POOL_DEBUG(SAT_DEBUG_STATS, "branching with %s\n", solvid2str(pool, p)); + POOL_DEBUG(SAT_DEBUG_SOLVER, "branching with %s\n", solvid2str(pool, p)); queue_empty(&dq); for (j = i + 1; j < solv->branches.count; j++) queue_push(&dq, solv->branches.elements[j]); @@ -1979,7 +1979,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak) /* kill old solvable so that we do not loop */ p = solv->branches.elements[lasti]; solv->branches.elements[lasti] = 0; - POOL_DEBUG(SAT_DEBUG_STATS, "minimizing %d -> %d with %s\n", solv->decisionmap[p], lastl, solvid2str(pool, p)); + POOL_DEBUG(SAT_DEBUG_SOLVER, "minimizing %d -> %d with %s\n", solv->decisionmap[p], lastl, solvid2str(pool, p)); minimizationsteps++; level = lastl; @@ -2805,7 +2805,7 @@ solver_solve(Solver *solv, Queue *job) /* make decisions based on job/update assertions */ makeruledecisions(solv); - POOL_DEBUG(SAT_DEBUG_STATS, "problems so far: %d\n", solv->problems.count); + POOL_DEBUG(SAT_DEBUG_SOLVER, "problems so far: %d\n", solv->problems.count); /* * ******************************************** -- 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] <sat-solver> master : - beautify
by Michael Schroeder 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 2589ce02d18e0fba3296fb0c9cf04cadb8403940 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 17 16:40:46 2009 +0200 - beautify --- src/bitmap.c | 11 ++++++++--- src/queue.c | 28 ++++++++++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/bitmap.c b/src/bitmap.c index 064fc4a..0485945 100644 --- a/src/bitmap.c +++ b/src/bitmap.c @@ -21,7 +21,7 @@ void map_init(Map *m, int n) { m->size = (n + 7) >> 3; - m->map = n ? sat_calloc(m->size, 1) : 0; + m->map = m->size ? sat_calloc(m->size, 1) : 0; } /* destructor */ @@ -37,8 +37,13 @@ void map_init_clone(Map *t, Map *s) { t->size = s->size; - t->map = sat_malloc(s->size); - memcpy(t->map, s->map, t->size); + if (s->size) + { + t->map = sat_malloc(s->size); + memcpy(t->map, s->map, s->size); + } + else + t->map = 0; } /* grow a map */ diff --git a/src/queue.c b/src/queue.c index fa10339..b2de746 100644 --- a/src/queue.c +++ b/src/queue.c @@ -16,6 +16,9 @@ #include "queue.h" #include "util.h" +#define EXTRA_SPACE 8 +#define EXTRA_SPACE_HEAD 8 + void queue_init(Queue *q) { @@ -26,11 +29,17 @@ queue_init(Queue *q) void queue_init_clone(Queue *t, Queue *s) { - t->alloc = t->elements = sat_malloc2(s->count + 8, sizeof(Id)); + if (!s->elements) + { + t->alloc = t->elements = 0; + t->count = t->left = 0; + return; + } + t->alloc = t->elements = sat_malloc2(s->count + EXTRA_SPACE, sizeof(Id)); if (s->count) memcpy(t->alloc, s->elements, s->count * sizeof(Id)); t->count = s->count; - t->left = 8; + t->left = EXTRA_SPACE; } void @@ -56,12 +65,11 @@ queue_alloc_one(Queue *q) { if (!q->alloc) { - /* queue was created with queue_init_buf */ - q->alloc = sat_malloc2(q->count + 8, sizeof(Id)); + q->alloc = sat_malloc2(q->count + EXTRA_SPACE, sizeof(Id)); if (q->count) memcpy(q->alloc, q->elements, q->count * sizeof(Id)); q->elements = q->alloc; - q->left = 8; + q->left = EXTRA_SPACE; } else if (q->alloc != q->elements) { @@ -73,8 +81,8 @@ queue_alloc_one(Queue *q) } else { - q->elements = q->alloc = sat_realloc2(q->alloc, q->count + 8, sizeof(Id)); - q->left = 8; + q->elements = q->alloc = sat_realloc2(q->alloc, q->count + EXTRA_SPACE, sizeof(Id)); + q->left = EXTRA_SPACE; } } @@ -85,7 +93,7 @@ queue_alloc_one_head(Queue *q) int l; if (!q->alloc || !q->left) queue_alloc_one(q); - l = q->left > 8 ? 8 : q->left; + l = q->left > EXTRA_SPACE_HEAD ? EXTRA_SPACE_HEAD : q->left; if (q->count); memmove(q->elements + l, q->elements, q->count * sizeof(Id)); q->elements += l; @@ -157,9 +165,9 @@ queue_insertn(Queue *q, int pos, int n) if (!q->alloc) queue_alloc_one(q); off = q->elements - q->alloc; - q->alloc = sat_realloc2(q->alloc, off + q->count + n + 8, sizeof(Id)); + q->alloc = sat_realloc2(q->alloc, off + q->count + n + EXTRA_SPACE, sizeof(Id)); q->elements = q->alloc + off; - q->left = n + 8; + q->left = n + EXTRA_SPACE; } if (pos < q->count) memmove(q->elements + pos + n, q->elements + pos, (q->count - pos) * sizeof(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] <libzypp> master : typo
by Michael Andres 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 53127ca9a58ee97d126976efdff6255a96c174cc Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 17 15:55:25 2009 +0200 typo --- zypp/media/MediaCD.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc index 53843d2..ada97b9 100644 --- a/zypp/media/MediaCD.cc +++ b/zypp/media/MediaCD.cc @@ -220,7 +220,7 @@ namespace zypp { { DeviceList detected; -#ifndef NO_HALa +#ifndef NO_HAL using namespace zypp::target::hal; try { -- 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] <libzypp> master : changes 6.8.2
by Michael Andres 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 6907e55bfe320fcb88aed15cbef325225e50d785 Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 17 15:48:41 2009 +0200 changes 6.8.2 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 248050c..21140ad 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "8") SET(LIBZYPP_MINOR "8") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 6.8.1 (8) +# LAST RELEASED: 6.8.2 (8) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index ed24057..ed479a2 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 17 15:39:17 CEST 2009 - ma(a)suse.de + +- Allow building libzypp without HAL (not recommended). Without HAL + CD/DVD device detection is limited to /dev/dvd and /dev/cdrom. +- version 6.8.2 (8) + +------------------------------------------------------------------- Fri Jun 5 21:16:45 CEST 2009 - ma(a)suse.de - Fix solver to use IdSting to avoid failing vendor checks. @@ -21,7 +29,7 @@ Thu May 28 12:53:02 CEST 2009 - ma(a)suse.de - New solver.allowVendorChange expert option in zypp.conf. - version 6.6.0 (6) -------------------------------------------------------------------- +------------------------------------------------------------------ Wed May 20 14:23:07 CEST 2009 - ma(a)suse.de - Fix lost housekeeping data in modifyRepo (bnc #503207) -- 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] <libzypp> master : Allow building libzypp without HAL (limited device detection).
by Michael Andres 17 Jun '09

17 Jun '09

ref: refs/heads/master commit c92d367cadaeda00a786a2bdc44a531d5ef05f95 Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 17 15:48:18 2009 +0200 Allow building libzypp without HAL (limited device detection). --- CMakeLists.txt | 11 +++++++-- zypp/media/MediaCD.cc | 41 ++++++++++++++++++++++++++++++++------- zypp/target/hal/HalContext.cc | 35 ++++++++++++++++++++++++++++----- zypp/target/hal/HalException.h | 4 +++ 4 files changed, 74 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a411aa..9fb552d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,11 +74,16 @@ ELSE (GETTEXT_FOUND) ENDIF (GETTEXT_FOUND) FIND_PACKAGE(Hal REQUIRED) -IF ( NOT HAL_FOUND) - MESSAGE( FATAL_ERROR " Hal not found" ) +IF ( NOT HAL_FOUND ) + MESSAGE( WARNING " Package 'hal' not found. HAL is mainly used for CD/DVD device detection." ) + MESSAGE( WARNING " If you build libzypp without HAL, this will result in a limited" ) + MESSAGE( WARNING " CD/DVD device detection (/dev/dvd,/dev/cdrom)." ) + SET(HAL_LIBRARY "") + SET(HAL_STORAGE_LIBRARY "") + ADD_DEFINITIONS(-DNO_HAL) ELSE ( NOT HAL_FOUND) INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR}) -# hal/libhal-storage.h is broken grrr + # hal/libhal-storage.h is broken grrr INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR}/hal) ENDIF( NOT HAL_FOUND) diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc index 6e8455a..53843d2 100644 --- a/zypp/media/MediaCD.cc +++ b/zypp/media/MediaCD.cc @@ -166,13 +166,13 @@ namespace zypp { cmd[1] = device_r.c_str(); cmd[2] = NULL; ExternalProgram eject(cmd, ExternalProgram::Stderr_To_Stdout); - + for(std::string out( eject.receiveLine()); out.length(); out = eject.receiveLine()) { DBG << " " << out; } - + if(eject.close() != 0) { WAR << "Eject of " << device_r << " failed." << std::endl; @@ -218,21 +218,22 @@ namespace zypp { MediaCD::DeviceList MediaCD::detectDevices(bool supportingDVD) const { - using namespace zypp::target::hal; - DeviceList detected; + +#ifndef NO_HALa + using namespace zypp::target::hal; try { HalContext hal(true); std::vector<std::string> drv_udis; drv_udis = hal.findDevicesByCapability("storage.cdrom"); - + DBG << "Found " << drv_udis.size() << " cdrom drive udis" << std::endl; for(size_t d = 0; d < drv_udis.size(); d++) { HalDrive drv( hal.getDriveFromUDI( drv_udis[d])); - + if( drv) { bool supportsDVD=false; @@ -275,7 +276,25 @@ namespace zypp { { ZYPP_CAUGHT(e); } - +#else // NO_HAL +#warning Poor CDROM devices detection without HAL + WAR << "Cdrom drive detection without HAL! " << std::endl; + PathInfo dvdinfo( "/dev/dvd" ); + PathInfo cdrinfo( "/dev/cdrom" ); + if ( dvdinfo.isBlk() ) + { + MediaSource media( "cdrom", dvdinfo.path().asString(), dvdinfo.major(), dvdinfo.minor() ); + DBG << "Found (NO_HAL): " << media << std::endl; + detected.push_back( media ); + } + if ( cdrinfo.isBlk() + && ! ( cdrinfo.major() == dvdinfo.major() && cdrinfo.minor() == dvdinfo.minor() ) ) + { + MediaSource media( "cdrom", cdrinfo.path().asString(), cdrinfo.major(), cdrinfo.minor() ); + DBG << "Found (NO_HAL): " << media << std::endl; + detected.push_back( media ); + } +#endif return detected; } @@ -698,8 +717,8 @@ namespace zypp { bool is_automounted = false; if( media.mediaSource && !media.mediaSource->name.empty()) { +#ifndef NO_HAL using namespace zypp::target::hal; - try { HalContext hal(true); @@ -742,6 +761,12 @@ namespace zypp { { ZYPP_CAUGHT(e); } +#else // NO_HAL +#warning Can not detect automounted media without HAL + INT << "Can not detect automounted media without HAL!" << endl; + // ma@: This codepath is probably unused due to 'REUSE_FOREIGN_MOUNTS == 2' + // Maybe we should cleanup all this automount-specail-handling. +#endif } DBG << "Media " << media.mediaSource->asString() << " attached on " << media.attachPoint->path diff --git a/zypp/target/hal/HalContext.cc b/zypp/target/hal/HalContext.cc index 640902d..c80367d 100644 --- a/zypp/target/hal/HalContext.cc +++ b/zypp/target/hal/HalContext.cc @@ -10,7 +10,30 @@ * * \brief Hardware abstaction layer library wrapper implementation. */ -#ifndef FAKE_HAL // disables zypp's HAL dependency +#include <zypp/target/hal/HalException.h> +////////////////////////////////////////////////////////////////////// +namespace zypp +{ //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// + namespace target + { ////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////// + namespace hal + { //////////////////////////////////////////////////////////////// + NoHalException::NoHalException() + : Exception(_("Sorry, but this version of libzypp was built without HAL support.")) + {} + //////////////////////////////////////////////////////////////// + } // namespace hal + ////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////// + } // namespace target + //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// +} // namespace zypp +////////////////////////////////////////////////////////////////////// + +#ifndef NO_HAL // disables zypp's HAL dependency #include <zypp/target/hal/HalContext.h> #include <zypp/thread/Mutex.h> @@ -1076,7 +1099,7 @@ namespace zypp //////////////////////////////////////////////////////////////////// } // namespace zypp ////////////////////////////////////////////////////////////////////// -#else // FAKE_HAL +#else // NO_HAL #include <zypp/target/hal/HalContext.h> #include <zypp/target/hal/HalException.h> namespace zypp @@ -1102,7 +1125,7 @@ namespace zypp // -------------------------------------------------------------- HalContext::HalContext(bool) - {} + { ZYPP_THROW( NoHalException() ); } HalContext::~HalContext() {} HalContext & @@ -1142,7 +1165,7 @@ namespace zypp { return ""; } // -------------------------------------------------------------- HalDrive::HalDrive() - {} + { ZYPP_THROW( NoHalException() ); } HalDrive::~HalDrive() {} HalDrive & @@ -1177,7 +1200,7 @@ namespace zypp // -------------------------------------------------------------- HalVolume::HalVolume() - {} + { ZYPP_THROW( NoHalException() ); } HalVolume::~HalVolume() {} HalVolume & @@ -1225,7 +1248,7 @@ namespace zypp //////////////////////////////////////////////////////////////////// } // namespace zypp ////////////////////////////////////////////////////////////////////// -#endif // FAKE_HAL +#endif // NO_HAL /* ** vim: set ts=2 sts=2 sw=2 ai et: diff --git a/zypp/target/hal/HalException.h b/zypp/target/hal/HalException.h index 3ea3189..4b957b8 100644 --- a/zypp/target/hal/HalException.h +++ b/zypp/target/hal/HalException.h @@ -94,6 +94,10 @@ namespace zypp std::string e_msg; }; + /** Exception thrown if we were built without hal support (-DNO_HAL). + */ + struct NoHalException: public Exception + { NoHalException(); }; //////////////////////////////////////////////////////////////// } // namespace hal -- 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] <libzypp> master : Remove obsolete DISABLE_AUTOMOUNTER code.
by Michael Andres 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 64f8f52a51f9f9fedba60e1348c4805393d1dd20 Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 17 14:18:31 2009 +0200 Remove obsolete DISABLE_AUTOMOUNTER code. --- zypp/media/MediaManager.cc | 149 +------------------------------------------- 1 files changed, 1 insertions(+), 148 deletions(-) diff --git a/zypp/media/MediaManager.cc b/zypp/media/MediaManager.cc index 535110b..fa8a884 100644 --- a/zypp/media/MediaManager.cc +++ b/zypp/media/MediaManager.cc @@ -20,16 +20,12 @@ #include "zypp/media/Mount.h" #include "zypp/thread/Mutex.h" #include "zypp/thread/MutexLock.h" -#include "zypp/target/hal/HalContext.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" #include "zypp/Pathname.h" #include "zypp/PathInfo.h" -#define DISABLE_AUTOMOUNTER 0 - - ////////////////////////////////////////////////////////////////////// namespace zypp { //////////////////////////////////////////////////////////////////// @@ -126,142 +122,6 @@ namespace zypp // ------------------------------------------------------------- typedef std::map<MediaAccessId, ManagedMedia> ManagedMediaMap; - - // ------------------------------------------------------------- - enum AutoMounterCleanUp - { - NONE, ENABLE, REMOVE - }; - - #define HAL_AUTOMOUNTER_UDI "/org/freedesktop/Hal/devices/computer" - #define HAL_AUTOMOUNTER_KEY "storage.disable_volume_handling" - - // ------------------------------------------------------------- - AutoMounterCleanUp - disableAutoMounter() - { - using namespace zypp::target::hal; - - AutoMounterCleanUp cleanup(NONE); -#if DISABLE_AUTOMOUNTER - try - { - HalContext hal(true); - bool disabled(false); - - // query - XXX << "Checking HAL volume handling property" - << std::endl; - try - { - disabled = hal.getDevicePropertyBool( - HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY - ); - - if( disabled) - { - MIL << "HAL volume handling is already disabled" - << std::endl; - } - else - { - cleanup = ENABLE; - XXX << "HAL volume handling is enabled" - << std::endl; - } - } - catch(const HalException &e) - { - ZYPP_CAUGHT(e); - XXX << "HAL volume handling is enabled (no property)" - << std::endl; - disabled = false; - cleanup = REMOVE; - } - - // disable - if( !disabled) - { - XXX << "Trying to disable HAL volume handling" - << std::endl; - try - { - hal.setDevicePropertyBool( - HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY, - true - ); - - MIL << "Disabled HAL volume handling (automounter)" - << std::endl; - } - catch(const HalException &e) - { - ZYPP_CAUGHT(e); - WAR << "Unable to disable HAL volume handling (automounter)" - << std::endl; - - cleanup = NONE; - } - } - } - catch(const HalException &e) - { - ZYPP_CAUGHT(e); - WAR << "Unable to disable HAL volume handling (automounter)" - << std::endl; - } -#endif // DISABLE_AUTOMOUNTER - return cleanup; - } - - // ------------------------------------------------------------- - void - restoreAutoMounter(AutoMounterCleanUp cleanup) - { - using namespace zypp::target::hal; - - if(cleanup == NONE) - return; - -#if DISABLE_AUTOMOUNTER - try - { - HalContext hal(true); - - if(cleanup == ENABLE) - { - XXX << "Trying to restore HAL volume handling -- enable" - << std::endl; - - hal.setDevicePropertyBool( - HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY, - false - ); - } - else - if(cleanup == REMOVE) - { - XXX << "Trying to restore HAL volume handling -- remove" - << std::endl; - - hal.removeDeviceProperty( - HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY - ); - } - - cleanup = NONE; - MIL << "Restored HAL volume handling (automounter)" - << std::endl; - } - catch(const HalException &e) - { - ZYPP_CAUGHT(e); - WAR << "Unable to restore HAL volume handling (automounter)" - << std::endl; - } -#endif // DISABLE_AUTOMOUNTER - } - //////////////////////////////////////////////////////////////// } // anonymous ////////////////////////////////////////////////////////////////// @@ -290,15 +150,11 @@ namespace zypp friend class MediaManager; MediaAccessId last_accessid; - AutoMounterCleanUp am_cleanup; ManagedMediaMap mediaMap; MediaManager_Impl() : last_accessid(0) - { - // disable automounter - am_cleanup = disableAutoMounter(); - } + {} public: ~MediaManager_Impl() @@ -330,9 +186,6 @@ namespace zypp // remove all other handlers mediaMap.clear(); - - // restore automounter state - restoreAutoMounter(am_cleanup); } catch( ... ) {} -- 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] <libzypp> master : Remove dead hal-capabilitiy code.
by Michael Andres 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 6c6c7e80010479074683efa9913e908ddc4bd612 Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 17 14:12:57 2009 +0200 Remove dead hal-capabilitiy code. --- zypp/CMakeLists.txt | 2 - zypp/target/hal/Hal.cc | 297 ------------------------------------------------ zypp/target/hal/Hal.h | 84 -------------- 3 files changed, 0 insertions(+), 383 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 2344cec..96ad6ba 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -574,12 +574,10 @@ INSTALL( FILES ) SET( zypp_target_hal_SRCS - target/hal/Hal.cc target/hal/HalContext.cc ) SET( zypp_target_hal_HEADERS - target/hal/Hal.h target/hal/HalContext.h target/hal/HalException.h ) diff --git a/zypp/target/hal/Hal.cc b/zypp/target/hal/Hal.cc deleted file mode 100644 index 29182da..0000000 --- a/zypp/target/hal/Hal.cc +++ /dev/null @@ -1,297 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/target/hal/Hal.cc - * -*/ -#include <iostream> - -#undef ZYPP_BASE_LOGGER_LOGGROUP -#define ZYPP_BASE_LOGGER_LOGGROUP "HAL" -#include "zypp/base/Logger.h" - -#include "zypp/target/hal/Hal.h" - -#ifndef FAKE_HAL - -#include <hal/libhal.h> - -#endif - -using std::endl; -using std::string; - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace target - { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace hal - { ///////////////////////////////////////////////////////////////// - -#ifndef FAKE_HAL -/////////////////////////////////////////////////////////////////// -// -// CLASS NAME : Hal::Impl -// -/** Hal implementation. */ -struct Hal::Impl -{ - /** - * pointer to dbus connection - */ - DBusConnection *_connection; - - /** - * pointer to complete hal context - */ - LibHalContext *_context; - - /** - * report HAL error and reset the error condition - */ - void - report_error (const std::string & reason, DBusError & error) const - { - ERR << reason << ": " << string (error.name) << ": " << string(error.message); - dbus_error_init(&error); - return; - } - - /** Ctor. */ - Impl() - { - DBusError error; - dbus_error_init (&error); - - _connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); // get shared connection to DBUS 'socket' - //_connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error); // get private connection DBUS 'socket' - if (_connection) { - _context = libhal_ctx_new (); // create empty HAL context - if (_context) { - if (libhal_ctx_set_dbus_connection (_context, _connection)) { // connect to HAL daemon via DBUS - if (libhal_ctx_init (_context, &error)) { // fill HAL context - return; - } else { - report_error ("libhal_ctx_init", error); - } - } else { - report_error ("libhal_ctx_set_dbus_connection", error); - } - libhal_ctx_free (_context); // clean up - _context = NULL; - } else { - report_error ("libhal_ctx_new: Can't create libhal context", error); - } - // dbus_connection_close (_connection); // call only if dbus_bus_get_private was used - dbus_connection_unref (_connection); - _connection = NULL; - } else { - report_error ("dbus_bus_get", error); - } - } - - - /** Dtor. */ - ~Impl() - { - if (_context) { - libhal_ctx_free (_context); - } - if (_connection) { - // dbus_connection_close (_connection); // call only if dbus_bus_get_private was used - dbus_connection_unref (_connection); - } - } - - /** - * query for HAL capability present - */ - - bool query( const std::string & cap_r ) const - { return query( cap_r, Rel::ANY, std::string() ); } - - /** - * query for HAL capability having a specific value - */ - bool query( const std::string & cap_r, - Rel op_r, - const std::string & val_r ) const - { - DBusError error; - dbus_error_init (&error); - - // ask HAL which devices provide the needed capability - - bool result = false; - - int device_count; - char **device_names = libhal_find_device_by_capability (_context, cap_r.c_str(), &device_count, &error); - - if (device_names == NULL) { - report_error ("libhal_find_device_by_capability", error); - result = false; - } - else if (device_count > 0) { - -#if 0 // once we get a capabilities value from HAL, we can compare it ... - if (value) { - string lhs (value); - int cmp = (lhs != rhs) ? ((lhs < rhs) ? -1 : 1) : 0; - - switch ( relation.inSwitch() ) - { - case Rel::EQ_e: - res = (cmp == 0); - break; - case Rel::NE_e: - res = (cmp != 0); - break; - case Rel::LT_e: - res = (cmp == -1); - break; - case Rel::LE_e: - res = (cmp != 1); - break; - case Rel::GT_e: - res = (cmp == 1); - break; - case Rel::GE_e: - res = (cmp != -1); - break; - case Rel::ANY_e: - res = true; - break; - case Rel::NONE_e: - res = false; - break; - default: - // We shouldn't get here. - INT << "Unknown relational opertor '" << relation << "' treated as 'NONE'" << endl; - break; - } - } -#endif - - result = true; - - } - - if (device_names != NULL) - libhal_free_string_array (device_names); - - return result; - } - - public: - /** Offer default Impl. */ - static shared_ptr<Impl> nullimpl() - { - static shared_ptr<Impl> _nullimpl( new Impl ); - return _nullimpl; - } - -}; // struct Hal::Impl - - -#else // FAKE_HAL - struct Hal::Impl - { - bool query( const std::string & cap_r ) const - { return query( cap_r, Rel::ANY, std::string() ); } - bool query( const std::string & cap_r, - Rel op_r, - const std::string & val_r ) const - { return false; } - /** Offer default Impl. */ - static shared_ptr<Impl> nullimpl() - { - static shared_ptr<Impl> _nullimpl( new Impl ); - return _nullimpl; - } - }; -#endif - -/////////////////////////////////////////////////////////////////// - -/** \relates Hal::Impl Stream output - * And maybe std::ostream & operator<< Hal::Impl below too. - * return libhal version or something like that. - */ -inline std::ostream & operator<<( std::ostream & str, const Hal::Impl & obj ) -{ - return str << "Hal::Impl"; -} - -/////////////////////////////////////////////////////////////////// -// -// CLASS NAME : Hal -// -/////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : Hal::Hal -// METHOD TYPE : Ctor -// -Hal::Hal() -: _pimpl( Impl::nullimpl() ) -{} - -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : Hal::~Hal -// METHOD TYPE : Dtor -// -Hal::~Hal() -{} - -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : Hal::instance -// METHOD TYPE : Hal & -// -Hal & Hal::instance() -{ - static Hal _singleton; - return _singleton; -} - -/////////////////////////////////////////////////////////////////// -// Foreward to implenemtation -/////////////////////////////////////////////////////////////////// - -bool Hal::query( const std::string & cap_r ) const -{ return _pimpl->query( cap_r ); } - -bool Hal::query( const std::string & cap_r, - Rel op_r, - const std::string & val_r ) const -{ return _pimpl->query( cap_r, op_r, val_r ); } - -/****************************************************************** -** -** FUNCTION NAME : operator<< -** FUNCTION TYPE : std::ostream & -*/ -std::ostream & operator<<( std::ostream & str, const Hal & obj ) -{ - return str << *obj._pimpl; -} - -///////////////////////////////////////////////////////////////// - } // namespace hal - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// - } // namespace target - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// diff --git a/zypp/target/hal/Hal.h b/zypp/target/hal/Hal.h deleted file mode 100644 index 7a7e0bd..0000000 --- a/zypp/target/hal/Hal.h +++ /dev/null @@ -1,84 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/target/hal/Hal.h - * -*/ -#ifndef ZYPP_TARGET_HAL_HAL_H -#define ZYPP_TARGET_HAL_HAL_H - -#include <iosfwd> -#include <string> - -#include "zypp/base/PtrTypes.h" -#include "zypp/Rel.h" - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace target - { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace hal - { ///////////////////////////////////////////////////////////////// - - /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : Hal - // - /** Hardware abstaction layer. - * Singleton. - */ - class Hal - { - friend std::ostream & operator<<( std::ostream & str, const Hal & obj ); - - public: - /** Implementation */ - class Impl; - - public: - /** Singleton access. */ - static Hal & instance(); - - /** Dtor */ - ~Hal(); - - public: - - /** */ - bool query( const std::string & cap_r ) const; - - /** */ - bool query( const std::string & cap_r, - Rel op_r, - const std::string & val_r ) const; - - private: - /** Singleton ctor. */ - Hal(); - - /** Pointer to implementation */ - RW_pointer<Impl> _pimpl; - }; - /////////////////////////////////////////////////////////////////// - - /** \relates Hal Stream output */ - std::ostream & operator<<( std::ostream & str, const Hal & obj ); - - ///////////////////////////////////////////////////////////////// - } // namespace hal - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// - } // namespace target - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// -#endif // ZYPP_TARGET_HAL_HAL_H -- 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] <sat-solver> master : - add solver_take_solution() function
by Michael Schroeder 17 Jun '09

17 Jun '09

ref: refs/heads/master commit 027ec47f07bed550064b681cae45cbac9d889d5f Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 17 11:08:51 2009 +0200 - add solver_take_solution() function - add solver_printsolution() function - rename solver_printsolutions() to solver_printallsolutions() - add transaction_init_clone() and transaction_free_orderdata() --- src/problems.c | 35 +++++++ src/problems.h | 3 + src/solverdebug.c | 215 ++++++++++++++++++++++-------------------- src/solverdebug.h | 5 +- src/transaction.c | 37 +++++++ src/transaction.h | 2 + tests/solver/deptestomatic.c | 2 +- tests/solver/yps.c | 2 +- 8 files changed, 194 insertions(+), 107 deletions(-) diff --git a/src/problems.c b/src/problems.c index bed7303..57bb545 100644 --- a/src/problems.c +++ b/src/problems.c @@ -686,6 +686,41 @@ solver_next_solutionelement(Solver *solv, Id problem, Id solution, Id element, I return element + 1; } +void +solver_take_solutionelement(Solver *solv, Id p, Id rp, Queue *job) +{ + int i; + + if (p == SOLVER_SOLUTION_JOB) + { + job->elements[rp - 1] = SOLVER_NOOP; + job->elements[rp] = 0; + return; + } + if (rp <= 0 && p <= 0) + return; /* just in case */ + if (rp > 0) + p = SOLVER_INSTALL|SOLVER_SOLVABLE; + else + { + rp = p; + p = SOLVER_ERASE|SOLVER_SOLVABLE; + } + for (i = 0; i < job->count; i += 2) + if (job->elements[i] == p && job->elements[i + 2] == rp) + return; + queue_push2(job, p, rp); +} + +void +solver_take_solution(Solver *solv, Id problem, Id solution, Queue *job) +{ + Id p, rp, element = 0; + while ((element = solver_next_solutionelement(solv, problem, solution, element, &p, &rp)) != 0) + solver_take_solutionelement(solv, p, rp, job); +} + + /*------------------------------------------------------------------- * * find problem rule diff --git a/src/problems.h b/src/problems.h index fad8834..b2ed55b 100644 --- a/src/problems.h +++ b/src/problems.h @@ -35,6 +35,9 @@ Id solver_next_solution(struct _Solver *solv, Id problem, Id solution); Id solver_solutionelement_count(struct _Solver *solv, Id problem, Id solution); Id solver_next_solutionelement(struct _Solver *solv, Id problem, Id solution, Id element, Id *p, Id *rp); +void solver_take_solutionelement(struct _Solver *solv, Id p, Id rp, Queue *job); +void solver_take_solution(struct _Solver *solv, Id problem, Id solution, Queue *job); + Id solver_findproblemrule(struct _Solver *solv, Id problem); void solver_findallproblemrules(struct _Solver *solv, Id problem, Queue *rules); diff --git a/src/solverdebug.c b/src/solverdebug.c index c0759f2..1970f75 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -501,14 +501,14 @@ solver_printtransaction(Solver *solv) } void -solver_printprobleminfo(Solver *solv, Queue *job, Id problem) +solver_printprobleminfo(Solver *solv, Id problem) { Pool *pool = solv->pool; Id probr; Id dep, source, target; probr = solver_findproblemrule(solv, problem); - switch (solver_problemruleinfo(solv, job, probr, &dep, &source, &target)) + switch (solver_ruleinfo(solv, probr, &source, &target, &dep)) { case SOLVER_RULE_DISTUPGRADE: POOL_DEBUG(SAT_DEBUG_RESULT, "%s does not belong to a distupgrade repository\n", solvid2str(pool, source)); @@ -561,121 +561,130 @@ solver_printprobleminfo(Solver *solv, Queue *job, Id problem) } void -solver_printsolutions(Solver *solv, Queue *job) +solver_printsolution(Solver *solv, Id problem, Id solution) { Pool *pool = solv->pool; - int pcnt; - Id p, rp, how, what, select; - Id problem, solution, element; + Id p, rp, element, how, what, select; Solvable *s, *sd; - POOL_DEBUG(SAT_DEBUG_RESULT, "Encountered problems! Here are the solutions:\n\n"); - pcnt = 1; - problem = 0; - while ((problem = solver_next_problem(solv, problem)) != 0) + element = 0; + while ((element = solver_next_solutionelement(solv, problem, solution, element, &p, &rp)) != 0) { - POOL_DEBUG(SAT_DEBUG_RESULT, "Problem %d:\n", pcnt++); - POOL_DEBUG(SAT_DEBUG_RESULT, "====================================\n"); - solver_printprobleminfo(solv, job, problem); - POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); - solution = 0; - while ((solution = solver_next_solution(solv, problem, solution)) != 0) - { - element = 0; - while ((element = solver_next_solutionelement(solv, problem, solution, element, &p, &rp)) != 0) + if (p == SOLVER_SOLUTION_JOB) + { + /* job, rp is index into job queue */ + how = solv->job.elements[rp - 1]; + what = solv->job.elements[rp]; + select = how & SOLVER_SELECTMASK; + switch (how & SOLVER_JOBMASK) { - if (p == SOLVER_SOLUTION_JOB) - { - /* job, rp is index into job queue */ - how = job->elements[rp - 1]; - what = job->elements[rp]; - select = how & SOLVER_SELECTMASK; - switch (how & SOLVER_JOBMASK) - { - case SOLVER_INSTALL: - if (select == SOLVER_SOLVABLE && solv->installed && pool->solvables[what].repo == solv->installed) - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not keep %s installed\n", solvid2str(pool, what)); - else if (select == SOLVER_SOLVABLE_PROVIDES) - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install a solvable %s\n", solver_select2str(solv, select, what)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install %s\n", solver_select2str(solv, select, what)); - break; - case SOLVER_ERASE: - if (select == SOLVER_SOLVABLE && !(solv->installed && pool->solvables[what].repo == solv->installed)) - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not forbid installation of %s\n", solvid2str(pool, what)); - else if (select == SOLVER_SOLVABLE_PROVIDES) - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not deinstall all solvables %s\n", solver_select2str(solv, select, what)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not deinstall %s\n", solver_select2str(solv, select, what)); - break; - case SOLVER_UPDATE: - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install most recent version of %s\n", solver_select2str(solv, select, what)); - break; - case SOLVER_LOCK: - POOL_DEBUG(SAT_DEBUG_RESULT, "- do not lock %s\n", solver_select2str(solv, select, what)); - break; - default: - POOL_DEBUG(SAT_DEBUG_RESULT, "- do something different\n"); - break; - } - } - else if (p == SOLVER_SOLUTION_INFARCH) + case SOLVER_INSTALL: + if (select == SOLVER_SOLVABLE && solv->installed && pool->solvables[what].repo == solv->installed) + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not keep %s installed\n", solvid2str(pool, what)); + else if (select == SOLVER_SOLVABLE_PROVIDES) + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install a solvable %s\n", solver_select2str(solv, select, what)); + else + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install %s\n", solver_select2str(solv, select, what)); + break; + case SOLVER_ERASE: + if (select == SOLVER_SOLVABLE && !(solv->installed && pool->solvables[what].repo == solv->installed)) + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not forbid installation of %s\n", solvid2str(pool, what)); + else if (select == SOLVER_SOLVABLE_PROVIDES) + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not deinstall all solvables %s\n", solver_select2str(solv, select, what)); + else + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not deinstall %s\n", solver_select2str(solv, select, what)); + break; + case SOLVER_UPDATE: + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not install most recent version of %s\n", solver_select2str(solv, select, what)); + break; + case SOLVER_LOCK: + POOL_DEBUG(SAT_DEBUG_RESULT, "- do not lock %s\n", solver_select2str(solv, select, what)); + break; + default: + POOL_DEBUG(SAT_DEBUG_RESULT, "- do something different\n"); + break; + } + } + else if (p == SOLVER_SOLUTION_INFARCH) + { + s = pool->solvables + rp; + if (solv->installed && s->repo == solv->installed) + POOL_DEBUG(SAT_DEBUG_RESULT, "- keep %s despite the inferior architecture\n", solvable2str(pool, s)); + else + POOL_DEBUG(SAT_DEBUG_RESULT, "- install %s despite the inferior architecture\n", solvable2str(pool, s)); + } + else if (p == SOLVER_SOLUTION_DISTUPGRADE) + { + s = pool->solvables + rp; + if (solv->installed && s->repo == solv->installed) + POOL_DEBUG(SAT_DEBUG_RESULT, "- keep obsolete %s\n", solvable2str(pool, s)); + else + POOL_DEBUG(SAT_DEBUG_RESULT, "- install %s from excluded repository\n", solvable2str(pool, s)); + } + else + { + /* policy, replace p with rp */ + s = pool->solvables + p; + sd = rp ? pool->solvables + rp : 0; + if (s == sd && solv->distupgrade) + { + POOL_DEBUG(SAT_DEBUG_RESULT, "- keep obsolete %s\n", solvable2str(pool, s)); + } + else if (sd) + { + int gotone = 0; + if (!solv->allowdowngrade && evrcmp(pool, s->evr, sd->evr, EVRCMP_MATCH_RELEASE) > 0) { - s = pool->solvables + rp; - if (solv->installed && s->repo == solv->installed) - POOL_DEBUG(SAT_DEBUG_RESULT, "- keep %s despite the inferior architecture\n", solvable2str(pool, s)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, "- install %s despite the inferior architecture\n", solvable2str(pool, s)); + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow downgrade of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd)); + gotone = 1; } - else if (p == SOLVER_SOLUTION_DISTUPGRADE) + if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(solv, s, sd)) { - s = pool->solvables + rp; - if (solv->installed && s->repo == solv->installed) - POOL_DEBUG(SAT_DEBUG_RESULT, "- keep obsolete %s\n", solvable2str(pool, s)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, "- install %s from excluded repository\n", solvable2str(pool, s)); + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow architecture change of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd)); + gotone = 1; } - else + if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(solv, s, sd)) { - /* policy, replace p with rp */ - s = pool->solvables + p; - sd = rp ? pool->solvables + rp : 0; - if (s == sd && solv->distupgrade) - { - POOL_DEBUG(SAT_DEBUG_RESULT, "- keep obsolete %s\n", solvable2str(pool, s)); - } - else if (sd) - { - int gotone = 0; - if (!solv->allowdowngrade && evrcmp(pool, s->evr, sd->evr, EVRCMP_MATCH_RELEASE) > 0) - { - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow downgrade of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd)); - gotone = 1; - } - if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(solv, s, sd)) - { - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow architecture change of %s to %s\n", solvable2str(pool, s), solvable2str(pool, sd)); - gotone = 1; - } - if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(solv, s, sd)) - { - if (sd->vendor) - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow vendor change from '%s' (%s) to '%s' (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), id2str(pool, sd->vendor), solvable2str(pool, sd)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow vendor change from '%s' (%s) to no vendor (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), solvable2str(pool, sd)); - gotone = 1; - } - if (!gotone) - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow replacement of %s with %s\n", solvable2str(pool, s), solvable2str(pool, sd)); - } + if (sd->vendor) + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow vendor change from '%s' (%s) to '%s' (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), id2str(pool, sd->vendor), solvable2str(pool, sd)); else - { - POOL_DEBUG(SAT_DEBUG_RESULT, "- allow deinstallation of %s\n", solvable2str(pool, s)); - } - + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow vendor change from '%s' (%s) to no vendor (%s)\n", id2str(pool, s->vendor), solvable2str(pool, s), solvable2str(pool, sd)); + gotone = 1; } + if (!gotone) + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow replacement of %s with %s\n", solvable2str(pool, s), solvable2str(pool, sd)); } - POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + else + { + POOL_DEBUG(SAT_DEBUG_RESULT, "- allow deinstallation of %s\n", solvable2str(pool, s)); + } + + } + } +} + +void +solver_printallsolutions(Solver *solv) +{ + Pool *pool = solv->pool; + int pcnt; + Id problem, solution; + + POOL_DEBUG(SAT_DEBUG_RESULT, "Encountered problems! Here are the solutions:\n\n"); + pcnt = 0; + problem = 0; + while ((problem = solver_next_problem(solv, problem)) != 0) + { + pcnt++; + POOL_DEBUG(SAT_DEBUG_RESULT, "Problem %d:\n", pcnt); + POOL_DEBUG(SAT_DEBUG_RESULT, "====================================\n"); + solver_printprobleminfo(solv, problem); + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + solution = 0; + while ((solution = solver_next_solution(solv, problem, solution)) != 0) + { + solver_printsolution(solv, problem, solution); + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); } } } diff --git a/src/solverdebug.h b/src/solverdebug.h index a581d39..8b2feec 100644 --- a/src/solverdebug.h +++ b/src/solverdebug.h @@ -25,8 +25,9 @@ extern void solver_printproblem(Solver *solv, Id v); extern void solver_printwatches(Solver *solv, int type); extern void solver_printdecisions(Solver *solv); extern void solver_printtransaction(Solver *solv); -extern void solver_printprobleminfo(Solver *solv, Queue *job, Id problem); -extern void solver_printsolutions(Solver *solv, Queue *job); +extern void solver_printprobleminfo(Solver *solv, Id problem); +extern void solver_printsolution(Solver *solv, Id problem, Id solution); +extern void solver_printallsolutions(Solver *solv); extern void solver_printtrivial(Solver *solv); extern const char *solver_select2str(Solver *solv, Id select, Id what); diff --git a/src/transaction.c b/src/transaction.c index a591258..6047dad 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -678,6 +678,7 @@ struct _TransactionOrderdata { struct _TransactionElement *tes; int ntes; Id *invedgedata; + int ninvedgedata; }; #define TYPE_BROKEN (1<<0) @@ -702,6 +703,34 @@ transaction_init(Transaction *trans, Pool *pool) } void +transaction_init_clone(Transaction *trans, Transaction *srctrans) +{ + memset(trans, 0, sizeof(*trans)); + trans->pool = srctrans->pool; + queue_init_clone(&trans->steps, &srctrans->steps); + queue_init_clone(&trans->transaction_info, &srctrans->transaction_info); + if (srctrans->transaction_installed) + { + Repo *installed = srctrans->pool->installed; + trans->transaction_installed = sat_calloc(installed->end - installed->start, sizeof(Id)); + memcpy(trans->transaction_installed, srctrans->transaction_installed, (installed->end - installed->start) * sizeof(Id)); + } + map_init_clone(&trans->transactsmap, &srctrans->transactsmap); + map_init_clone(&trans->noobsmap, &srctrans->noobsmap); + if (srctrans->orderdata) + { + struct _TransactionOrderdata *od = srctrans->orderdata; + trans->orderdata = sat_calloc(1, sizeof(*trans->orderdata)); + trans->orderdata->tes = sat_malloc2(od->ntes, sizeof(*od->tes)); + memcpy(trans->orderdata->tes, od->tes, od->ntes * sizeof(*od->tes)); + trans->orderdata->ntes = od->ntes; + trans->orderdata->invedgedata = sat_malloc2(od->ninvedgedata, sizeof(Id)); + memcpy(trans->orderdata->invedgedata, od->invedgedata, od->ninvedgedata * sizeof(Id)); + trans->orderdata->ninvedgedata = od->ninvedgedata; + } +} + +void transaction_free(Transaction *trans) { queue_free(&trans->steps); @@ -709,6 +738,12 @@ transaction_free(Transaction *trans) trans->transaction_installed = sat_free(trans->transaction_installed); map_free(&trans->transactsmap); map_free(&trans->noobsmap); + transaction_free_orderdata(trans); +} + +void +transaction_free_orderdata(Transaction *trans) +{ if (trans->orderdata) { struct _TransactionOrderdata *od = trans->orderdata; @@ -1581,6 +1616,7 @@ transaction_order(Transaction *trans, int flags) for (i = 1, te = od.tes + i; i < numte; i++, te++) te->edges = te->mark; /* edges now points into invedgedata */ od.edgedata = sat_free(od.edgedata); + od.nedgedata = j + 1; /* now the final ordering */ for (i = 1, te = od.tes + i; i < numte; i++, te++) @@ -1701,6 +1737,7 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) trans->orderdata->tes = od.tes; trans->orderdata->ntes = numte; trans->orderdata->invedgedata = od.invedgedata; + trans->orderdata->ninvedgedata = od.nedgedata; } else { diff --git a/src/transaction.h b/src/transaction.h index 5309bab..2738e5c 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -80,7 +80,9 @@ typedef struct _Transaction { #define SOLVER_TRANSACTION_KEEP_ORDERDATA (1 << 0) extern void transaction_init(Transaction *trans, struct _Pool *pool); +extern void transaction_init_clone(Transaction *trans, Transaction *srctrans); extern void transaction_free(Transaction *trans); +extern void transaction_free_orderdata(Transaction *trans); extern void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap); /* if p is installed, returns with pkg(s) obsolete p */ diff --git a/tests/solver/deptestomatic.c b/tests/solver/deptestomatic.c index 7fea99c..e619661 100644 --- a/tests/solver/deptestomatic.c +++ b/tests/solver/deptestomatic.c @@ -1522,7 +1522,7 @@ endElement( void *userData, const char *name ) solver_solve( solv, &pd->trials ); // print result if (solv->problems.count) - solver_printsolutions(solv, &pd->trials); + solver_printallsolutions(solv); else { if (verbose >= 2) diff --git a/tests/solver/yps.c b/tests/solver/yps.c index 48c3b3f..231f6e3 100644 --- a/tests/solver/yps.c +++ b/tests/solver/yps.c @@ -458,7 +458,7 @@ main(int argc, char **argv) solv->solution_callback = solution_callback; solver_solve(solv, &job); if (solv->problems.count) - solver_printsolutions(solv, &job); + solver_printallsolutions(solv); solver_printdecisions(solv); if (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] <sat-solver> master : - fix coding style a bit
by Michael Schroeder 16 Jun '09

16 Jun '09

ref: refs/heads/master commit e21d5f36b8adc3e6ffcb667868f7d7ca97268bf8 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 16 19:06:39 2009 +0200 - fix coding style a bit --- src/repo.c | 4 ++-- src/repo_helix.c | 49 +++++++++++++++++++++++-------------------------- src/repodata.c | 2 +- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/repo.c b/src/repo.c index 4a72485..58632eb 100644 --- a/src/repo.c +++ b/src/repo.c @@ -340,7 +340,7 @@ repo_sidedata_extend(Repo *repo, void *b, size_t size, Id p, int count) { int d = repo->start - p; b = sat_extend(b, n, d, size, REPO_SIDEDATA_BLOCK); - memmove((char*)b + d * size, b, n * size); + memmove((char *)b + d * size, b, n * size); memset(b, 0, d * size); n += d; } @@ -348,7 +348,7 @@ repo_sidedata_extend(Repo *repo, void *b, size_t size, Id p, int count) { int d = p + count - repo->end; b = sat_extend(b, n, d, size, REPO_SIDEDATA_BLOCK); - memset((char*)b + n * size, 0, d * size); + memset((char *)b + n * size, 0, d * size); } return b; } diff --git a/src/repo_helix.c b/src/repo_helix.c index ebeff07..fcff7c9 100644 --- a/src/repo_helix.c +++ b/src/repo_helix.c @@ -530,15 +530,15 @@ startElement(void *userData, const char *name, const char **atts) } } -static const char* findKernelFlavor(Parsedata *pd, Solvable *s) +static const char *findKernelFlavor(Parsedata *pd, Solvable *s) { Pool *pool = pd->pool; - - Id pid, *pidp = 0; + Id pid, *pidp; if (s->provides) { - for (pidp = pd->repo->idarraydata + s->provides; pidp && (pid = *pidp++) != 0; ) + pidp = pd->repo->idarraydata + s->provides; + while ((pid = *pidp++) != 0) { Reldep *prd; const char *depname; @@ -547,32 +547,29 @@ static const char* findKernelFlavor(Parsedata *pd, Solvable *s) continue; /* wrong provides name */ prd = GETRELDEP(pool, pid); depname = id2str(pool, prd->name); - if (!strncmp(depname, "kernel-", strlen("kernel-"))) - { - return depname + strlen("kernel-"); - } + if (!strncmp(depname, "kernel-", 7)) + return depname + 7; } } - if (!s->requires) - return 0; - - for (pidp = pd->repo->idarraydata + s->requires ; pidp && (pid = *pidp++) != 0; ) + if (s->requires) { - const char *depname = 0; - - if (!ISRELDEP(pid)) - { - depname = id2str(pool, pid); - } - else + pidp = pd->repo->idarraydata + s->requires; + while ((pid = *pidp++) != 0) { - Reldep *prd = GETRELDEP(pool, pid); - depname = id2str(pool, prd->name); - } - if (!strncmp(depname, "kernel-", strlen("kernel-"))) - { - return depname + strlen("kernel-"); + const char *depname; + + if (!ISRELDEP(pid)) + { + depname = id2str(pool, pid); + } + else + { + Reldep *prd = GETRELDEP(pool, pid); + depname = id2str(pool, prd->name); + } + if (!strncmp(depname, "kernel-", 7)) + return depname + 7; } } @@ -594,7 +591,7 @@ endElement(void *userData, const char *name) Pool *pool = pd->pool; Solvable *s = pd->solvable; Id evr; - unsigned int t=0; + unsigned int t = 0; if (pd->depth != pd->statedepth) { diff --git a/src/repodata.c b/src/repodata.c index 887da4d..fdb7e3a 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -452,7 +452,7 @@ maybe_load_repodata(Repodata *data, Id keyname) } } -static inline unsigned char* +static inline unsigned char * solvid2data(Repodata *data, Id solvid, Id *schemap) { unsigned char *dp = data->incoredata; -- 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] <sat-solver> master : - fastlz.c is obsolete since a long time
by Michael Schroeder 16 Jun '09

16 Jun '09

ref: refs/heads/master commit 92f88662112794e6c51ee5a918294e26a43b47c2 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 16 18:56:05 2009 +0200 - fastlz.c is obsolete since a long time --- src/fastlz.c | 702 ---------------------------------------------------------- 1 files changed, 0 insertions(+), 702 deletions(-) diff --git a/src/fastlz.c b/src/fastlz.c deleted file mode 100644 index 05a6554..0000000 --- a/src/fastlz.c +++ /dev/null @@ -1,702 +0,0 @@ -/* - * Copyright (c) 2007, Novell Inc. - * - * This program is licensed under the BSD license, read LICENSE.BSD - * for further information - */ - -#include <sys/types.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include <time.h> - -#define BLOCK_SIZE (65536*1) -#if BLOCK_SIZE <= 65536 -typedef __uint16_t Ref; -#else -typedef __uint32_t Ref; -#endif - -/* - The format is tailored for fast decompression (i.e. only byte based), - and skewed to ASCII content (highest bit often not set): - - a 0LLLLLLL - - self-describing ASCII character hex L - b 100lllll <l+1 bytes> - - literal run of length l+1 - c 101oolll <8o> - - back ref of length l+2, at offset -(o+1) (o < 1 << 10) - d 110lllll <8o> - - back ref of length l+2+8, at offset -(o+1) (o < 1 << 8) - e 1110llll <8o> <8o> - - back ref of length l+3, at offset -(o+1) (o < 1 << 16) - f1 1111llll <8l> <8o> <8o> - - back ref, length l+19 (l < 1<<12), offset -(o+1) (o < 1<<16) - f2 11110lll <8l> <8o> <8o> - - back ref, length l+19 (l < 1<<11), offset -(o+1) (o < 1<<16) - g 11111lll <8l> <8o> <8o> <8o> - - back ref, length l+5 (l < 1<<11), offset -(o+1) (o < 1<<24) - - Generally for a literal of length L we need L+1 bytes, hence it is - better to encode also very short backrefs (2 chars) as backrefs if - their offset is small, as that only needs two bytes. Except if we - already have a literal run, in that case it's better to append there, - instead of breaking it for a backref. So given a potential backref - at offset O, length L the strategy is as follows: - - L < 2 : encode as 1-literal - L == 2, O > 1024 : encode as 1-literal - L == 2, have already literals: encode as 1-literal - O = O - 1 - L >= 2, L <= 9, O < 1024 : encode as c - L >= 10, L <= 41, O < 256 : encode as d - else we have either O >= 1024, or L >= 42: - L < 3 : encode as 1-literal - L >= 3, L <= 18, O < 65536 : encode as e - L >= 19, L <= 4095+18, O < 65536 : encode as f - else we have either L >= 4096+18 or O >= 65536. - O >= 65536: encode as 1-literal, too bad - (with the current block size this can't happen) - L >= 4096+18, so reduce to 4095+18 : encode as f -*/ - - -unsigned int -compress_buf (const unsigned char *in, unsigned int in_len, - unsigned char *out, unsigned int out_len) -{ - unsigned int oo = 0; //out-offset - unsigned int io = 0; //in-offset -#define HS (65536) - Ref htab[HS]; - Ref hnext[BLOCK_SIZE]; - memset (htab, -1, sizeof (htab)); - memset (hnext, -1, sizeof (hnext)); - unsigned int litofs = 0; - while (io + 2 < in_len) - { - /* Search for a match of the string starting at IN, we have at - least three characters. */ - unsigned int hval = in[io] | in[io + 1] << 8 | in[io + 2] << 16; - unsigned int try, mlen, mofs, tries; - hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5; - hval = hval & (HS - 1); - try = htab[hval]; - hnext[io] = htab[hval]; - htab[hval] = io; - mlen = 0; - mofs = 0; - - for (tries = 0; try != -1 && tries < 12; tries++) - { - if (try < io - && in[try] == in[io] && in[try + 1] == in[io + 1]) - { - mlen = 2; - mofs = (io - try) - 1; - break; - } - try = hnext[try]; - } - for (; try != -1 && tries < 12; tries++) - { - //assert (mlen >= 2); - //assert (io + mlen < in_len); - /* Try a match starting from [io] with the strings at [try]. - That's only sensible if TRY actually is before IO (can happen - with uninit hash table). If we have a previous match already - we're only going to take the new one if it's longer, hence - check the potentially last character. */ - if (try < io && in[try + mlen] == in[io + mlen]) - { - unsigned int this_len, this_ofs; - if (memcmp (in + try, in + io, mlen)) - goto no_match; - this_len = mlen + 1; - /* Now try extending the match by more characters. */ - for (; - io + this_len < in_len - && in[try + this_len] == in[io + this_len]; this_len++) - ; -#if 0 - unsigned int testi; - for (testi = 0; testi < this_len; testi++) - assert (in[try + testi] == in[io + testi]); -#endif - this_ofs = (io - try) - 1; - /*if (this_ofs > 65535) - goto no_match; */ -#if 0 - assert (this_len >= 2); - assert (this_len >= mlen); - assert (this_len > mlen || (this_len == mlen && this_ofs > mofs)); -#endif - mlen = this_len, mofs = this_ofs; - /* If our match extends up to the end of input, no next - match can become better. This is not just an - optimization, it establishes a loop invariant - (io + mlen < in_len). */ - if (io + mlen >= in_len) - goto match_done; - } - no_match: - try = hnext[try]; - /*if (io - try - 1 >= 65536) - break;*/ - } - -match_done: - if (mlen) - { - //fprintf (stderr, "%d %d\n", mlen, mofs); - if (mlen == 2 && (litofs || mofs >= 1024)) - mlen = 0; - /*else if (mofs >= 65536) - mlen = 0;*/ - else if (mofs >= 65536) - { - if (mlen >= 2048 + 5) - mlen = 2047 + 5; - else if (mlen < 5) - mlen = 0; - } - else if (mlen < 3) - mlen = 0; - /*else if (mlen >= 4096 + 19) - mlen = 4095 + 19;*/ - else if (mlen >= 2048 + 19) - mlen = 2047 + 19; - /* Skip this match if the next character would deliver a better one, - but only do this if we have the chance to really extend the - length (i.e. our current length isn't yet the (conservative) - maximum). */ - if (mlen && mlen < (2048 + 5) && io + 3 < in_len) - { - unsigned int hval = - in[io + 1] | in[io + 2] << 8 | in[io + 3] << 16; - unsigned int try; - hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5; - hval = hval & (HS - 1); - try = htab[hval]; - if (try < io + 1 - && in[try] == in[io + 1] && in[try + 1] == in[io + 2]) - { - unsigned int this_len; - this_len = 2; - for (; - io + 1 + this_len < in_len - && in[try + this_len] == in[io + 1 + this_len]; - this_len++) - ; - if (this_len >= mlen) - mlen = 0; - } - } - } - if (!mlen) - { - if (!litofs) - litofs = io + 1; - io++; - } - else - { - if (litofs) - { - litofs--; - unsigned litlen = io - litofs; - //fprintf (stderr, "lit: %d\n", litlen); - while (litlen) - { - unsigned int easy_sz; - /* Emit everything we can as self-describers. As soon as - we hit a byte we can't emit as such we're going to emit - a length descriptor anyway, so we can as well include - bytes < 0x80 which might follow afterwards in that run. */ - for (easy_sz = 0; - easy_sz < litlen && in[litofs + easy_sz] < 0x80; - easy_sz++) - ; - if (easy_sz) - { - if (oo + easy_sz >= out_len) - return 0; - memcpy (out + oo, in + litofs, easy_sz); - litofs += easy_sz; - oo += easy_sz; - litlen -= easy_sz; - if (!litlen) - break; - } - if (litlen <= 32) - { - if (oo + 1 + litlen >= out_len) - return 0; - out[oo++] = 0x80 | (litlen - 1); - while (litlen--) - out[oo++] = in[litofs++]; - break; - } - else - { - /* Literal length > 32, so chunk it. */ - if (oo + 1 + 32 >= out_len) - return 0; - out[oo++] = 0x80 | 31; - memcpy (out + oo, in + litofs, 32); - oo += 32; - litofs += 32; - litlen -= 32; - } - } - litofs = 0; - } - - //fprintf (stderr, "ref: %d @ %d\n", mlen, mofs); - - if (mlen >= 2 && mlen <= 9 && mofs < 1024) - { - if (oo + 2 >= out_len) - return 0; - out[oo++] = 0xa0 | ((mofs & 0x300) >> 5) | (mlen - 2); - out[oo++] = mofs & 0xff; - } - else if (mlen >= 10 && mlen <= 41 && mofs < 256) - { - if (oo + 2 >= out_len) - return 0; - out[oo++] = 0xc0 | (mlen - 10); - out[oo++] = mofs; - } - else if (mofs >= 65536) - { - assert (mlen >= 5 && mlen < 2048 + 5); - if (oo + 5 >= out_len) - return 0; - out[oo++] = 0xf8 | ((mlen - 5) >> 8); - out[oo++] = (mlen - 5) & 0xff; - out[oo++] = mofs & 0xff; - out[oo++] = (mofs >> 8) & 0xff; - out[oo++] = mofs >> 16; - } - else if (mlen >= 3 && mlen <= 18) - { - assert (mofs < 65536); - if (oo + 3 >= out_len) - return 0; - out[oo++] = 0xe0 | (mlen - 3); - out[oo++] = mofs & 0xff; - out[oo++] = mofs >> 8; - } - else - { - assert (mlen >= 19 && mlen <= 4095 + 19 && mofs < 65536); - if (oo + 4 >= out_len) - return 0; - out[oo++] = 0xf0 | ((mlen - 19) >> 8); - out[oo++] = (mlen - 19) & 0xff; - out[oo++] = mofs & 0xff; - out[oo++] = mofs >> 8; - } - /* Insert the hashes for the compressed run [io..io+mlen-1]. - For [io] we have it already done at the start of the loop. - So it's from [io+1..io+mlen-1], and we need three chars per - hash, so the accessed characters will be [io+1..io+mlen-1+2], - ergo io+mlen+1 < in_len. */ - mlen--; - io++; - while (mlen--) - { - if (io + 2 < in_len) - { - unsigned int hval = - in[io] | in[io + 1] << 8 | in[io + 2] << 16; - hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5; - hval = hval & (HS - 1); - hnext[io] = htab[hval]; - htab[hval] = io; - } - io++; - }; - } - } - /* We might have some characters left. */ - if (io < in_len && !litofs) - litofs = io + 1; - io = in_len; - if (litofs) - { - litofs--; - unsigned litlen = io - litofs; - //fprintf (stderr, "lit: %d\n", litlen); - while (litlen) - { - unsigned int easy_sz; - /* Emit everything we can as self-describers. As soon as we hit a - byte we can't emit as such we're going to emit a length - descriptor anyway, so we can as well include bytes < 0x80 which - might follow afterwards in that run. */ - for (easy_sz = 0; easy_sz < litlen && in[litofs + easy_sz] < 0x80; - easy_sz++) - ; - if (easy_sz) - { - if (oo + easy_sz >= out_len) - return 0; - memcpy (out + oo, in + litofs, easy_sz); - litofs += easy_sz; - oo += easy_sz; - litlen -= easy_sz; - if (!litlen) - break; - } - if (litlen <= 32) - { - if (oo + 1 + litlen >= out_len) - return 0; - out[oo++] = 0x80 | (litlen - 1); - while (litlen--) - out[oo++] = in[litofs++]; - break; - } - else - { - /* Literal length > 32, so chunk it. */ - if (oo + 1 + 32 >= out_len) - return 0; - out[oo++] = 0x80 | 31; - memcpy (out + oo, in + litofs, 32); - oo += 32; - litofs += 32; - litlen -= 32; - } - } - litofs = 0; - } - return oo; -} - -unsigned int -unchecked_decompress_buf (const unsigned char *in, unsigned int in_len, - unsigned char *out, - unsigned int out_len __attribute__((unused))) -{ - unsigned char *orig_out = out; - const unsigned char *in_end = in + in_len; - while (in < in_end) - { - unsigned int first = *in++; - int o; - switch (first >> 4) - { - default: - /* This default case can't happen, but GCCs VRP is not strong - enough to see this, so make this explicitely not fall to - the end of the switch, so that we don't have to initialize - o above. */ - continue; - case 0: case 1: - case 2: case 3: - case 4: case 5: - case 6: case 7: - //a 0LLLLLLL - //fprintf (stderr, "lit: 1\n"); - *out++ = first; - continue; - case 8: case 9: - //b 100lllll <l+1 bytes> - { - unsigned int l = first & 31; - //fprintf (stderr, "lit: %d\n", l); - do - *out++ = *in++; - while (l--); - continue; - } - case 10: case 11: - //c 101oolll <8o> - { - o = first & (3 << 3); - o = (o << 5) | *in++; - first = (first & 7) + 2; - break; - } - case 12: case 13: - //d 110lllll <8o> - { - o = *in++; - first = (first & 31) + 10; - break; - } - case 14: - // e 1110llll <8o> <8o> - { - o = in[0] | (in[1] << 8); - in += 2; - first = first & 31; - first += 3; - break; - } - case 15: - //f1 1111llll <8o> <8o> <8l> - //f2 11110lll <8o> <8o> <8l> - // g 11111lll <8o> <8o> <8o> <8l> - { - first = first & 15; - if (first >= 8) - { - first = (((first - 8) << 8) | in[0]) + 5; - o = in[1] | (in[2] << 8) | (in[3] << 16); - in += 4; - } - else - { - first = ((first << 8) | in[0]) + 19; - o = in[1] | (in[2] << 8); - in += 3; - } - break; - } - } - //fprintf (stderr, "ref: %d @ %d\n", first, o); - o++; - o = -o; -#if 0 - /* We know that first will not be zero, and this loop structure is - better optimizable. */ - do - { - *out = *(out - o); - out++; - } - while (--first); -#else - switch (first) - { - case 18: *out = *(out + o); out++; - case 17: *out = *(out + o); out++; - case 16: *out = *(out + o); out++; - case 15: *out = *(out + o); out++; - case 14: *out = *(out + o); out++; - case 13: *out = *(out + o); out++; - case 12: *out = *(out + o); out++; - case 11: *out = *(out + o); out++; - case 10: *out = *(out + o); out++; - case 9: *out = *(out + o); out++; - case 8: *out = *(out + o); out++; - case 7: *out = *(out + o); out++; - case 6: *out = *(out + o); out++; - case 5: *out = *(out + o); out++; - case 4: *out = *(out + o); out++; - case 3: *out = *(out + o); out++; - case 2: *out = *(out + o); out++; - case 1: *out = *(out + o); out++; - case 0: break; - default: - /* Duff duff :-) */ - switch (first & 15) - { - do - { - case 0: *out = *(out + o); out++; - case 15: *out = *(out + o); out++; - case 14: *out = *(out + o); out++; - case 13: *out = *(out + o); out++; - case 12: *out = *(out + o); out++; - case 11: *out = *(out + o); out++; - case 10: *out = *(out + o); out++; - case 9: *out = *(out + o); out++; - case 8: *out = *(out + o); out++; - case 7: *out = *(out + o); out++; - case 6: *out = *(out + o); out++; - case 5: *out = *(out + o); out++; - case 4: *out = *(out + o); out++; - case 3: *out = *(out + o); out++; - case 2: *out = *(out + o); out++; - case 1: *out = *(out + o); out++; - } - while ((int)(first -= 16) > 0); - } - break; - } -#endif - } - return out - orig_out; -} - -#ifdef STANDALONE - -static void -transfer_file (FILE * from, FILE * to, int compress) -{ - unsigned char inb[BLOCK_SIZE]; - unsigned char outb[BLOCK_SIZE]; - while (!feof (from) && !ferror (from)) - { - unsigned int in_len, out_len; - if (compress) - { - in_len = fread (inb, 1, BLOCK_SIZE, from); - if (in_len) - { - unsigned char *b = outb; - out_len = compress_buf (inb, in_len, outb, sizeof (outb)); - if (!out_len) - b = inb, out_len = in_len; - if (fwrite (&out_len, sizeof (out_len), 1, to) != 1) - { - perror ("write size"); - exit (1); - } - if (fwrite (b, out_len, 1, to) != 1) - { - perror ("write data"); - exit (1); - } - } - } - else - { - if (fread (&in_len, sizeof (in_len), 1, from) != 1) - { - if (feof (from)) - return; - perror ("can't read size"); - exit (1); - } - if (fread (inb, in_len, 1, from) != 1) - { - perror ("can't read data"); - exit (1); - } - out_len = - unchecked_decompress_buf (inb, in_len, outb, sizeof (outb)); - if (fwrite (outb, out_len, 1, to) != 1) - { - perror ("can't write output"); - exit (1); - } - } - } -} - -/* Just for benchmarking purposes. */ -static void -dumb_memcpy (void *dest, const void *src, unsigned int len) -{ - char *d = dest; - const char *s = src; - while (len--) - *d++ = *s++; -} - -static void -benchmark (FILE * from) -{ - unsigned char inb[BLOCK_SIZE]; - unsigned char outb[BLOCK_SIZE]; - unsigned int in_len = fread (inb, 1, BLOCK_SIZE, from); - unsigned int out_len; - if (!in_len) - { - perror ("can't read from input"); - exit (1); - } - - unsigned int calib_loop; - unsigned int per_loop; - unsigned int i, j; - clock_t start, end; - float seconds; - -#if 0 - calib_loop = 1; - per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) - { - calib_loop *= 2; - for (i = 0; i < calib_loop; i++) - dumb_memcpy (outb, inb, in_len); - per_loop += calib_loop; - } - - fprintf (stderr, "memcpy:\nCalibrated to %d iterations per loop\n", - per_loop); - - start = clock (); - for (i = 0; i < 10; i++) - for (j = 0; j < per_loop; j++) - dumb_memcpy (outb, inb, in_len); - end = clock (); - seconds = (end - start) / (float) CLOCKS_PER_SEC; - fprintf (stderr, "%.2f seconds == %.2f MB/s\n", seconds, - ((long long) in_len * per_loop * 10) / (1024 * 1024 * seconds)); -#endif - - calib_loop = 1; - per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) - { - calib_loop *= 2; - for (i = 0; i < calib_loop; i++) - compress_buf (inb, in_len, outb, sizeof (outb)); - per_loop += calib_loop; - } - - fprintf (stderr, "compression:\nCalibrated to %d iterations per loop\n", - per_loop); - - start = clock (); - for (i = 0; i < 10; i++) - for (j = 0; j < per_loop; j++) - compress_buf (inb, in_len, outb, sizeof (outb)); - end = clock (); - seconds = (end - start) / (float) CLOCKS_PER_SEC; - fprintf (stderr, "%.2f seconds == %.2f MB/s\n", seconds, - ((long long) in_len * per_loop * 10) / (1024 * 1024 * seconds)); - - out_len = compress_buf (inb, in_len, outb, sizeof (outb)); - - calib_loop = 1; - per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) - { - calib_loop *= 2; - for (i = 0; i < calib_loop; i++) - unchecked_decompress_buf (outb, out_len, inb, sizeof (inb)); - per_loop += calib_loop; - } - - fprintf (stderr, "decompression:\nCalibrated to %d iterations per loop\n", - per_loop); - - start = clock (); - for (i = 0; i < 10; i++) - for (j = 0; j < per_loop; j++) - unchecked_decompress_buf (outb, out_len, inb, sizeof (inb)); - end = clock (); - seconds = (end - start) / (float) CLOCKS_PER_SEC; - fprintf (stderr, "%.2f seconds == %.2f MB/s\n", seconds, - ((long long) in_len * per_loop * 10) / (1024 * 1024 * seconds)); -} - -int -main (int argc, char *argv[]) -{ - int compress = 1; - if (argc > 1 && !strcmp (argv[1], "-d")) - compress = 0; - if (argc > 1 && !strcmp (argv[1], "-b")) - benchmark (stdin); - else - transfer_file (stdin, stdout, compress); - return 0; -} - -#endif -- 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] <sat-solver> master : - add queue_insertn, queue_deleten, queue_truncate
by Michael Schroeder 16 Jun '09

16 Jun '09

ref: refs/heads/master commit 94fa0f67e5225a4104555bfe34db238114356287 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 16 18:51:17 2009 +0200 - add queue_insertn, queue_deleten, queue_truncate --- src/queue.c | 37 +++++++++++++++++++++++++++++++++++++ src/queue.h | 30 +++++++++++++++++------------- src/transaction.c | 10 +++++----- 3 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/queue.c b/src/queue.c index 2f9f75a..fa10339 100644 --- a/src/queue.c +++ b/src/queue.c @@ -143,3 +143,40 @@ queue_delete2(Queue *q, int pos) q->left += 2; q->count -= 2; } + +void +queue_insertn(Queue *q, int pos, int n) +{ + if (n <= 0) + return; + if (pos > q->count) + pos = q->count; + if (q->left < n) + { + int off; + if (!q->alloc) + queue_alloc_one(q); + off = q->elements - q->alloc; + q->alloc = sat_realloc2(q->alloc, off + q->count + n + 8, sizeof(Id)); + q->elements = q->alloc + off; + q->left = n + 8; + } + if (pos < q->count) + memmove(q->elements + pos + n, q->elements + pos, (q->count - pos) * sizeof(Id)); + memset(q->elements + pos, 0, n * sizeof(Id)); + q->left -= n; + q->count += n; +} + +void +queue_deleten(Queue *q, int pos, int n) +{ + if (n <= 0 || pos >= q->count) + return; + if (pos + n >= q->count) + n = q->count - pos; + else + memmove(q->elements + pos, q->elements + pos + n, (q->count - n - pos) * sizeof(Id)); + q->left += n; + q->count -= n; +} diff --git a/src/queue.h b/src/queue.h index 090799e..01e6a50 100644 --- a/src/queue.h +++ b/src/queue.h @@ -23,7 +23,8 @@ typedef struct _Queue { } Queue; -extern void queue_alloc_one(Queue *q); +extern void queue_alloc_one(Queue *q); /* internal */ +extern void queue_alloc_one_head(Queue *q); /* internal */ /* clear queue */ static inline void @@ -60,19 +61,10 @@ queue_pop(Queue *q) static inline void queue_unshift(Queue *q, Id id) { - if (q->alloc && q->alloc != q->elements) - { - *--q->elements = id; - q->count++; - return; - } - if (!q->left) - queue_alloc_one(q); - if (q->count) - memmove(q->elements + 1, q->elements, sizeof(Id) * q->count); + if (!q->alloc || q->alloc == q->elements) + queue_alloc_one_head(q); + *--q->elements = id; q->count++; - q->elements[0] = id; - q->left--; } static inline void @@ -101,6 +93,16 @@ queue_push2(Queue *q, Id id1, Id id2) queue_push(q, id2); } +static inline void +queue_truncate(Queue *q, int n) +{ + if (q->count > n) + { + q->left += q->count - n; + q->count = n; + } +} + extern void queue_init(Queue *q); extern void queue_init_buffer(Queue *q, Id *buf, int size); extern void queue_init_clone(Queue *t, Queue *s); @@ -108,7 +110,9 @@ extern void queue_free(Queue *q); extern void queue_insert(Queue *q, int pos, Id id); extern void queue_insert2(Queue *q, int pos, Id id1, Id id2); +extern void queue_insertn(Queue *q, int pos, int n); extern void queue_delete(Queue *q, int pos); extern void queue_delete2(Queue *q, int pos); +extern void queue_deleten(Queue *q, int pos, int n); #endif /* SATSOLVER_QUEUE_H */ diff --git a/src/transaction.c b/src/transaction.c index 2706111..a591258 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -1777,9 +1777,8 @@ transaction_add_obsoleted(Transaction *trans) /* make room */ steps = &trans->steps; oldcount = steps->count; - for (i = 0; i < max; i++) - queue_push(steps, 0); - memmove(steps->elements + max, steps->elements, oldcount * sizeof(Id)); + queue_insertn(steps, 0, max); + /* now add em */ map_init(&done, installed->end - installed->start); queue_init(&obsq); @@ -1805,10 +1804,11 @@ transaction_add_obsoleted(Transaction *trans) trans->steps.elements[j++] = p; } } + + /* free unneeded space */ + queue_truncate(steps, j); map_free(&done); queue_free(&obsq); - while (steps->count > j) - queue_pop(steps); } static void -- 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] <sat-solver> master : - add transaction_add_obsoleted() function
by Michael Schroeder 16 Jun '09

16 Jun '09

ref: refs/heads/master commit b204ccb6313146c8c5b821f095064e12585d1f26 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 16 10:40:26 2009 +0200 - add transaction_add_obsoleted() function --- src/transaction.c | 82 +++++++++++++++++++++++++++++++++++++++------------- src/transaction.h | 2 + 2 files changed, 63 insertions(+), 21 deletions(-) diff --git a/src/transaction.c b/src/transaction.c index 3d28be7..2706111 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -1382,7 +1382,6 @@ transaction_order(Transaction *trans, int flags) Queue todo, obsq, samerepoq, uninstq; int cycstart, cycel; Id *cycle; - unsigned char *obsoleted; int oldcount; int start, now; Repo *lastrepo; @@ -1602,10 +1601,6 @@ transaction_order(Transaction *trans, int flags) queue_push(&todo, i); } assert(todo.count > 0 || uninstq.count > 0); - if (installed) - obsoleted = sat_calloc(installed->end - installed->start, 1); - else - obsoleted = 0; oldcount = tr->count; queue_empty(tr); @@ -1666,21 +1661,6 @@ transaction_order(Transaction *trans, int flags) printf("do %s [%d]\n", solvid2str(pool, te->p), temedianr[i]); #endif s = pool->solvables + te->p; - if (installed && s->repo != installed) - { - queue_empty(&obsq); - transaction_all_obs_pkgs(trans, te->p, &obsq); - for (j = 0; j < obsq.count; j++) - { - p = obsq.elements[j]; - assert(p >= installed->start && p < installed->end); - if (!obsoleted[p - installed->start]) - { - queue_push(tr, p); - obsoleted[p - installed->start] = 1; - } - } - } for (j = te->edges; od.invedgedata[j]; j++) { struct _TransactionElement *te2 = od.tes + od.invedgedata[j]; @@ -1700,7 +1680,6 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) } } } - sat_free(obsoleted); sat_free(temedianr); queue_free(&todo); queue_free(&samerepoq); @@ -1708,7 +1687,11 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) queue_free(&obsq); for (i = 1, te = od.tes + i; i < numte; i++, te++) assert(te->mark == 0); + + /* add back obsoleted packages */ + transaction_add_obsoleted(trans); assert(tr->count == oldcount); + POOL_DEBUG(SAT_DEBUG_STATS, "creating new transaction took %d ms\n", sat_timems(now)); POOL_DEBUG(SAT_DEBUG_STATS, "transaction ordering took %d ms\n", sat_timems(start)); @@ -1771,6 +1754,63 @@ transaction_order_add_choices(Transaction *trans, Id chosen, Queue *choices) return choices->count; } +void +transaction_add_obsoleted(Transaction *trans) +{ + Pool *pool = trans->pool; + Repo *installed = pool->installed; + Id p; + Solvable *s; + int i, j, k, max, oldcount; + Map done; + Queue obsq, *steps; + + if (!installed || !trans->steps.count) + return; + /* calculate upper bound */ + max = 0; + FOR_REPO_SOLVABLES(installed, p, s) + if (MAPTST(&trans->transactsmap, p)) + max++; + if (!max) + return; + /* make room */ + steps = &trans->steps; + oldcount = steps->count; + for (i = 0; i < max; i++) + queue_push(steps, 0); + memmove(steps->elements + max, steps->elements, oldcount * sizeof(Id)); + /* now add em */ + map_init(&done, installed->end - installed->start); + queue_init(&obsq); + for (j = 0, i = max; i < steps->count; i++) + { + p = trans->steps.elements[i]; + if (pool->solvables[p].repo == installed) + { + if (!trans->transaction_installed[p - pool->installed->start]) + trans->steps.elements[j++] = p; + continue; + } + trans->steps.elements[j++] = p; + queue_empty(&obsq); + transaction_all_obs_pkgs(trans, p, &obsq); + for (k = 0; k < obsq.count; k++) + { + p = obsq.elements[k]; + assert(p >= installed->start && p < installed->end); + if (MAPTST(&done, p - installed->start)) + continue; + MAPSET(&done, p - installed->start); + trans->steps.elements[j++] = p; + } + } + map_free(&done); + queue_free(&obsq); + while (steps->count > j) + queue_pop(steps); +} + static void transaction_check_pkg(Transaction *trans, Id tepkg, Id pkg, Map *ins, Map *seen, int onlyprereq, Id noconfpkg, int depth) { diff --git a/src/transaction.h b/src/transaction.h index deecaeb..5309bab 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -104,6 +104,8 @@ extern void transaction_order(Transaction *trans, int flags); * installed. start with chosen = 0 * needs an ordered transaction created with SOLVER_TRANSACTION_KEEP_ORDERDATA */ extern int transaction_order_add_choices(Transaction *trans, Id chosen, Queue *choices); +/* add obsoleted packages into transaction steps */ +extern void transaction_add_obsoleted(Transaction *trans); /* debug function, report problems found in the order */ extern void transaction_check_order(Transaction *trans); -- 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] <sat-solver> master : - move output arg to back in solver_calculate_noobsmap()
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit bb39cf887ab57e8ca9f2ed906589e2fe57295f47 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 20:51:29 2009 +0200 - move output arg to back in solver_calculate_noobsmap() --- src/pool.h | 7 ++++--- src/solver.c | 4 ++-- src/solver.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pool.h b/src/pool.h index be0ef66..e9959ee 100644 --- a/src/pool.h +++ b/src/pool.h @@ -320,9 +320,10 @@ const char *pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep); for (vp = pool_whatprovides(pool, d) ; (v = pool->whatprovidesdata[vp++]) != 0; ) /* loop over all repositories */ -#define FOR_REPOS(rid, r) \ - for (rid = 0; rid < pool->nrepos; rid++) \ - if ((r = pool->repos[rid]) != 0) +/* note that idx is not the repoid */ +#define FOR_REPOS(idx, r) \ + for (idx = 0; idx < pool->nrepos; idx++) \ + if ((r = pool->repos[idx]) != 0) #define POOL_DEBUG(type, ...) do {if ((pool->debugmask & (type)) != 0) pool_debug(pool, (type), __VA_ARGS__);} while (0) diff --git a/src/solver.c b/src/solver.c index fccee4a..132f7f4 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2344,7 +2344,7 @@ findrecommendedsuggested(Solver *solv) } void -solver_calculate_noobsmap(Pool *pool, Map *noobsmap, Queue *job) +solver_calculate_noobsmap(Pool *pool, Queue *job, Map *noobsmap) { int i; Id how, what, select; @@ -2413,7 +2413,7 @@ solver_solve(Solver *solv, Queue *job) */ /* create noobsolete map if needed */ - solver_calculate_noobsmap(pool, &solv->noobsoletes, job); + solver_calculate_noobsmap(pool, job, &solv->noobsoletes); map_init(&addedmap, pool->nsolvables); MAPSET(&addedmap, SYSTEMSOLVABLE); diff --git a/src/solver.h b/src/solver.h index 3166602..3f6574f 100644 --- a/src/solver.h +++ b/src/solver.h @@ -269,7 +269,7 @@ extern void solver_reset(Solver *solv); extern int solver_dep_installed(Solver *solv, Id dep); extern int solver_splitprovides(Solver *solv, Id dep); -extern void solver_calculate_noobsmap(Pool *pool, Map *noobsmap, Queue *job); +extern void solver_calculate_noobsmap(Pool *pool, Queue *job, Map *noobsmap); /* obsolete */ extern SolverRuleinfo solver_problemruleinfo(Solver *solv, Queue *job, Id rid, Id *depp, Id *sourcep, Id *targetp); -- 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] <sat-solver> master : - add repoid to repo struct
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit b7c583929e3487a804a5b6b483f8b6a5f0ed31ae Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 19:24:20 2009 +0200 - add repoid to repo struct --- src/pool.h | 1 + src/repo.c | 8 +++++++- src/repo.h | 8 +++++++- src/rules.c | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pool.h b/src/pool.h index 5dc813b..be0ef66 100644 --- a/src/pool.h +++ b/src/pool.h @@ -183,6 +183,7 @@ static inline Solvable *pool_id2solvable(Pool *pool, Id p) { return pool->solvables + p; } + extern const char *solvable2str(Pool *pool, Solvable *s); static inline const char *solvid2str(Pool *pool, Id p) { diff --git a/src/repo.c b/src/repo.c index 4fc38b7..4a72485 100644 --- a/src/repo.c +++ b/src/repo.c @@ -46,6 +46,7 @@ repo_create(Pool *pool, const char *name) repo = (Repo *)sat_calloc(1, sizeof(*repo)); pool->repos = (Repo **)sat_realloc2(pool->repos, pool->nrepos + 1, sizeof(Repo *)); pool->repos[pool->nrepos++] = repo; + repo->repoid = pool->nrepos; repo->name = name ? strdup(name) : 0; repo->pool = pool; repo->start = pool->nsolvables; @@ -298,7 +299,12 @@ repo_free(Repo *repo, int reuseids) if (i == pool->nrepos) /* repo not in pool, return */ return; if (i < pool->nrepos - 1) - memmove(pool->repos + i, pool->repos + i + 1, (pool->nrepos - 1 - i) * sizeof(Repo *)); + { + memmove(pool->repos + i, pool->repos + i + 1, (pool->nrepos - 1 - i) * sizeof(Repo *)); + /* fix repo ids */ + for (; i < pool->nrepos - 1; i++) + pool->repos[i]->repoid = i + 1; + } pool->nrepos--; repo_freedata(repo); } diff --git a/src/repo.h b/src/repo.h index 70ded77..6ceeb65 100644 --- a/src/repo.h +++ b/src/repo.h @@ -21,7 +21,8 @@ typedef struct _Repo { const char *name; - struct _Pool *pool; /* pool containing repo data */ + Id repoid; /* our id */ + Pool *pool; /* pool containing repo data */ int start; /* start of this repo solvables within pool->solvables */ int end; /* last solvable + 1 of this repo */ @@ -121,6 +122,11 @@ static inline void repo_free_solvable_block(Repo *repo, Id start, int count, int pool_free_solvable_block(repo->pool, start, count, reuseids); } +static inline Repo *pool_id2repo(Pool *pool, Id repoid) +{ + return pool->repos[repoid - 1]; +} + #define FOR_REPO_SOLVABLES(r, p, s) \ for (p = (r)->start, s = (r)->pool->solvables + p; p < (r)->end; p++, s = (r)->pool->solvables + p) \ if (s->repo == (r)) diff --git a/src/rules.c b/src/rules.c index d13dd12..8d1ff8d 100644 --- a/src/rules.c +++ b/src/rules.c @@ -1149,9 +1149,9 @@ solver_createdupmaps(Solver *solv) switch (how & SOLVER_JOBMASK) { case SOLVER_DISTUPGRADE: - if (what < 0 || what > pool->nrepos) + if (what <= 0 || what > pool->nrepos) break; - repo = pool->repos[what]; + repo = pool_id2repo(pool, what); FOR_REPO_SOLVABLES(repo, p, s) { MAPSET(&solv->dupmap, p); -- 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] <sat-solver> master : - add FOR_REPOS macro to iterate over repos
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit 17eb50eed1e1eb5064d1873f1ffa886001b0f4a2 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 18:29:53 2009 +0200 - add FOR_REPOS macro to iterate over repos --- bindings/pool.i | 17 +++++++++++------ src/pool.h | 6 ++++++ tools/dumpsolv.c | 14 ++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/bindings/pool.i b/bindings/pool.i index 85a8caf..7dc103c 100644 --- a/bindings/pool.i +++ b/bindings/pool.i @@ -506,9 +506,12 @@ typedef struct _Pool {} Pool; */ void each_repo() { + Pool *pool = $self; + Repo *r; int i; - for (i = 0; i < $self->nrepos; ++i ) - rb_yield(SWIG_NewPointerObj((void*) $self->repos[i], SWIGTYPE_p__Repo, 0)); + + FOR_REPOS(i, r) + rb_yield(SWIG_NewPointerObj((void*)r, SWIGTYPE_p__Repo, 0)); } #endif #if defined(SWIGPYTHON) @@ -530,11 +533,13 @@ typedef struct _Pool {} Pool; */ Repo *find_repo( const char *name ) { + Pool *pool = $self; + Repo *r; int i; - for (i = 0; i < $self->nrepos; ++i ) { - if (!strcmp( $self->repos[i]->name, name )) - return $self->repos[i]; - } + + FOR_REPOS(i, r) + if (!strcmp(r->name, name)) + return r; return NULL; } diff --git a/src/pool.h b/src/pool.h index 1c54264..5dc813b 100644 --- a/src/pool.h +++ b/src/pool.h @@ -318,6 +318,12 @@ const char *pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep); #define FOR_PROVIDES(v, vp, d) \ for (vp = pool_whatprovides(pool, d) ; (v = pool->whatprovidesdata[vp++]) != 0; ) +/* loop over all repositories */ +#define FOR_REPOS(rid, r) \ + for (rid = 0; rid < pool->nrepos; rid++) \ + if ((r = pool->repos[rid]) != 0) + + #define POOL_DEBUG(type, ...) do {if ((pool->debugmask & (type)) != 0) pool_debug(pool, (type), __VA_ARGS__);} while (0) #define IF_POOLDEBUG(type) if ((pool->debugmask & (type)) != 0) diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c index aad1d24..cc6ce94 100644 --- a/tools/dumpsolv.c +++ b/tools/dumpsolv.c @@ -287,18 +287,16 @@ int main(int argc, char **argv) } #endif - for (j = 0; 1 && j < pool->nrepos; j++) + n = 0; + FOR_REPOS(j, repo) { - repo = pool->repos[j]; dump_repodata(repo); printf("repo %d contains %d solvables\n", j, repo->nsolvables); printf("repo start: %d end: %d\n", repo->start, repo->end); - for (i = repo->start, n = 1; i < repo->end; i++) + FOR_REPO_SOLVABLES(repo, i, s) { - s = pool->solvables + i; - if (s->repo != repo) - continue; + n++; printf("\n"); printf("solvable %d (%d):\n", n, i); #if 0 @@ -316,15 +314,11 @@ int main(int argc, char **argv) printids(repo, "enhances", s->enhances); if (repo->rpmdbid) printf("rpmdbid: %u\n", repo->rpmdbid[i - repo->start]); -#if 0 - dump_attrs (repo, n - 1); -#endif #endif dump_repoattrs(repo, i); #if 0 dump_some_attrs(repo, s); #endif - n++; } #if 0 tryme(repo, 0, SOLVABLE_MEDIANR, 0, 0); -- 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] <sat-solver> master : - code cleanup
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit cedeb5bc8eef67646497a67c0658fa9c87b732a1 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 18:08:50 2009 +0200 - code cleanup --- src/bitmap.c | 20 ++++++++++++++++-- src/bitmap.h | 1 + src/queue.c | 55 ++++++++++++++++++++++++++++++++++------------------ src/rules.c | 2 +- src/solver.c | 4 +- src/transaction.c | 9 +++++-- 6 files changed, 63 insertions(+), 28 deletions(-) diff --git a/src/bitmap.c b/src/bitmap.c index 200bb41..064fc4a 100644 --- a/src/bitmap.c +++ b/src/bitmap.c @@ -16,6 +16,7 @@ #include "bitmap.h" #include "util.h" +/* constructor */ void map_init(Map *m, int n) { @@ -23,7 +24,7 @@ map_init(Map *m, int n) m->map = n ? sat_calloc(m->size, 1) : 0; } -// free space allocated +/* destructor */ void map_free(Map *m) { @@ -31,7 +32,7 @@ map_free(Map *m) m->size = 0; } -// copy t <- s +/* copy constructor t <- s */ void map_init_clone(Map *t, Map *s) { @@ -40,4 +41,17 @@ map_init_clone(Map *t, Map *s) memcpy(t->map, s->map, t->size); } -// EOF +/* grow a map */ +void +map_grow(Map *m, int n) +{ + n = (n + 7) >> 3; + if (m->size < n) + { + m->map = sat_realloc(m->map, n); + memset(m->map + m->size, 0, n - m->size); + m->size = n; + } +} + +/* EOF */ diff --git a/src/bitmap.h b/src/bitmap.h index 2373910..d9994c6 100644 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -33,6 +33,7 @@ map_empty(Map *m) extern void map_init(Map *m, int n); extern void map_init_clone(Map *t, Map *s); +extern void map_grow(Map *m, int n); extern void map_free(Map *m); #endif /* SATSOLVER_BITMAP_H */ diff --git a/src/queue.c b/src/queue.c index 38fd765..2f9f75a 100644 --- a/src/queue.c +++ b/src/queue.c @@ -17,6 +17,13 @@ #include "util.h" void +queue_init(Queue *q) +{ + q->alloc = q->elements = 0; + q->count = q->left = 0; +} + +void queue_init_clone(Queue *t, Queue *s) { t->alloc = t->elements = sat_malloc2(s->count + 8, sizeof(Id)); @@ -27,13 +34,6 @@ queue_init_clone(Queue *t, Queue *s) } void -queue_init(Queue *q) -{ - q->alloc = q->elements = 0; - q->count = q->left = 0; -} - -void queue_init_buffer(Queue *q, Id *buf, int size) { q->alloc = 0; @@ -54,27 +54,44 @@ queue_free(Queue *q) void queue_alloc_one(Queue *q) { - if (q->alloc && q->alloc != q->elements) + if (!q->alloc) { - memmove(q->alloc, q->elements, q->count * sizeof(Id)); - q->left += q->elements - q->alloc; + /* queue was created with queue_init_buf */ + q->alloc = sat_malloc2(q->count + 8, sizeof(Id)); + if (q->count) + memcpy(q->alloc, q->elements, q->count * sizeof(Id)); q->elements = q->alloc; + q->left = 8; } - else if (q->alloc) + else if (q->alloc != q->elements) { - q->elements = q->alloc = sat_realloc2(q->alloc, q->count + 8, sizeof(Id)); - q->left += 8; + int l = q->elements - q->alloc; + if (q->count) + memmove(q->alloc, q->elements, q->count * sizeof(Id)); + q->elements -= l; + q->left += l; } else { - q->alloc = sat_malloc2(q->count + 8, sizeof(Id)); - if (q->count) - memcpy(q->alloc, q->elements, q->count * sizeof(Id)); - q->elements = q->alloc; - q->left += 8; + q->elements = q->alloc = sat_realloc2(q->alloc, q->count + 8, sizeof(Id)); + q->left = 8; } } +/* make room for an element in front of queue */ +void +queue_alloc_one_head(Queue *q) +{ + int l; + if (!q->alloc || !q->left) + queue_alloc_one(q); + l = q->left > 8 ? 8 : q->left; + if (q->count); + memmove(q->elements + l, q->elements, q->count * sizeof(Id)); + q->elements += l; + q->left -= l; +} + void queue_insert(Queue *q, int pos, Id id) { @@ -106,7 +123,7 @@ queue_insert2(Queue *q, int pos, Id id1, Id id2) { memmove(q->elements + pos + 2, q->elements + pos, (q->count - 2 - pos) * sizeof(Id)); q->elements[pos] = id1; - q->elements[pos] = id2; + q->elements[pos + 1] = id2; } } diff --git a/src/rules.c b/src/rules.c index 11f3301..d13dd12 100644 --- a/src/rules.c +++ b/src/rules.c @@ -1221,7 +1221,7 @@ solver_addduprules(Solver *solv, Map *addedmap) if (solv->installed && ps->repo == solv->installed) { if (!solv->updatemap.size) - map_init(&solv->updatemap, pool->nsolvables); + map_grow(&solv->updatemap, pool->nsolvables); MAPSET(&solv->updatemap, p); if (!MAPTST(&solv->dupmap, p)) { diff --git a/src/solver.c b/src/solver.c index 055ea32..fccee4a 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2357,7 +2357,7 @@ solver_calculate_noobsmap(Pool *pool, Map *noobsmap, Queue *job) what = job->elements[i + 1]; select = how & SOLVER_SELECTMASK; if (!noobsmap->size) - map_init(noobsmap, pool->nsolvables); + map_grow(noobsmap, pool->nsolvables); FOR_JOB_SELECT(p, pp, select, what) MAPSET(noobsmap, p); } @@ -2698,7 +2698,7 @@ solver_solve(Solver *solv, Queue *job) if (!solv->installed || s->repo != solv->installed) continue; if (!solv->updatemap.size) - map_init(&solv->updatemap, pool->nsolvables); + map_grow(&solv->updatemap, pool->nsolvables); MAPSET(&solv->updatemap, p); } break; diff --git a/src/transaction.c b/src/transaction.c index 1e94df4..3d28be7 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -210,6 +210,9 @@ transaction_type(Transaction *trans, Id p, int mode) type = transaction_base_type(trans, p); + if (type == SOLVER_TRANSACTION_IGNORE) + return SOLVER_TRANSACTION_IGNORE; /* not part of the transaction */ + if ((mode & SOLVER_TRANSACTION_RPM_ONLY) != 0) { /* application wants to know what to feed to rpm */ @@ -454,7 +457,7 @@ transaction_classify(Transaction *trans, int mode, Queue *classes) } } /* now sort all vendor/arch changes */ - if (classes->count) + if (classes->count > 4) sat_sort(classes->elements, classes->count / 4, 4 * sizeof(Id), classify_cmp, trans); /* finally add all classes. put erases last */ i = SOLVER_TRANSACTION_ERASE; @@ -519,7 +522,7 @@ transaction_classify_pkgs(Transaction *trans, int mode, Id class, Id from, Id to continue; } } - if (pkgs->count) + if (pkgs->count > 1) sat_sort(pkgs->elements, pkgs->count, sizeof(Id), classify_cmp_pkgs, trans); } @@ -543,7 +546,7 @@ create_transaction_info(Transaction *trans, Queue *decisionq) if (p <= 0 || p == SYSTEMSOLVABLE) continue; s = pool->solvables + p; - if (s->repo == installed) + if (!s->repo || s->repo == installed) continue; noobs = trans->noobsmap.size && MAPTST(&trans->noobsmap, p); FOR_PROVIDES(p2, pp2, s->name) -- 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] <sat-solver> master : - make out parameters last in function calls
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit 20b7e09307f502f89f0d61cf3177ee98c4ddf2b4 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 16:33:01 2009 +0200 - make out parameters last in function calls - rename "class" parameter, as g++ chokes otherwise --- src/solverdebug.c | 4 ++-- src/transaction.c | 6 +++--- src/transaction.h | 31 ++++++++++++++++++++++++------- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/solverdebug.c b/src/solverdebug.c index 4ac561f..c0759f2 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -410,7 +410,7 @@ solver_printtransaction(Solver *solv) queue_init(&classes); queue_init(&pkgs); mode = 0; - transaction_classify(trans, &classes, mode); + transaction_classify(trans, mode, &classes); for (i = 0; i < classes.count; i += 4) { Id class = classes.elements[i]; @@ -447,7 +447,7 @@ solver_printtransaction(Solver *solv) } if (class == SOLVER_TRANSACTION_IGNORE) continue; - transaction_classify_pkgs(trans, &pkgs, mode, class, classes.elements[i + 2], classes.elements[i + 3]); + transaction_classify_pkgs(trans, mode, class, classes.elements[i + 2], classes.elements[i + 3], &pkgs); *line = 0; linel = 0; for (j = 0; j < pkgs.count; j++) diff --git a/src/transaction.c b/src/transaction.c index f5d51b3..1e94df4 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -388,7 +388,7 @@ classify_cmp_pkgs(const void *ap, const void *bp, void *dp) } void -transaction_classify(Transaction *trans, Queue *classes, int mode) +transaction_classify(Transaction *trans, int mode, Queue *classes) { Pool *pool = trans->pool; int ntypes[SOLVER_TRANSACTION_MAXTYPE]; @@ -479,7 +479,7 @@ transaction_classify(Transaction *trans, Queue *classes, int mode) } void -transaction_classify_pkgs(Transaction *trans, Queue *pkgs, int mode, Id class, Id from, Id to) +transaction_classify_pkgs(Transaction *trans, int mode, Id class, Id from, Id to, Queue *pkgs) { Pool *pool = trans->pool; int i; @@ -1725,7 +1725,7 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) int -transaction_order_add_choices(Transaction *trans, Queue *choices, Id chosen) +transaction_order_add_choices(Transaction *trans, Id chosen, Queue *choices) { int i, j; struct _TransactionOrderdata *od = trans->orderdata; diff --git a/src/transaction.h b/src/transaction.h index 2e0a130..deecaeb 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -61,7 +61,7 @@ typedef struct _Transaction { #define SOLVER_TRANSACTION_MAXTYPE 0x3f -/* show modes */ +/* modes */ #define SOLVER_TRANSACTION_SHOW_ACTIVE (1 << 0) #define SOLVER_TRANSACTION_SHOW_ALL (1 << 1) #define SOLVER_TRANSACTION_SHOW_OBSOLETES (1 << 2) @@ -76,21 +76,38 @@ typedef struct _Transaction { #define SOLVER_TRANSACTION_ARCHCHANGE 0x100 #define SOLVER_TRANSACTION_VENDORCHANGE 0x101 +/* order flags */ +#define SOLVER_TRANSACTION_KEEP_ORDERDATA (1 << 0) + extern void transaction_init(Transaction *trans, struct _Pool *pool); extern void transaction_free(Transaction *trans); extern void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap); -extern void transaction_all_obs_pkgs(Transaction *trans, Id p, Queue *pkgs); + +/* if p is installed, returns with pkg(s) obsolete p */ +/* if p is not installed, returns with pkg(s) we obsolete */ extern Id transaction_obs_pkg(Transaction *trans, Id p); +extern void transaction_all_obs_pkgs(Transaction *trans, Id p, Queue *pkgs); + +/* return step type of a transaction element */ extern Id transaction_type(Transaction *trans, Id p, int mode); -extern void transaction_classify(Transaction *trans, Queue *classes, int mode); -extern void transaction_classify_pkgs(Transaction *trans, Queue *pkgs, int mode, Id class, Id from, Id to); +/* return sorted collection of all step types */ +/* classify_pkgs can be used to return all packages of a type */ +extern void transaction_classify(Transaction *trans, int mode, Queue *classes); +extern void transaction_classify_pkgs(Transaction *trans, int mode, Id type, Id from, Id to, Queue *pkgs); + +/* order a transaction */ extern void transaction_order(Transaction *trans, int flags); -extern int transaction_order_add_choices(Transaction *trans, Queue *choices, Id chosen); + +/* roll your own order funcion: + * add pkgs free for installation to queue choices after chosen was + * installed. start with chosen = 0 + * needs an ordered transaction created with SOLVER_TRANSACTION_KEEP_ORDERDATA */ +extern int transaction_order_add_choices(Transaction *trans, Id chosen, Queue *choices); + +/* debug function, report problems found in the order */ extern void transaction_check_order(Transaction *trans); -/* order flags */ -#define SOLVER_TRANSACTION_KEEP_ORDERDATA (1 << 0) #ifdef __cplusplus } -- 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] <sat-solver> master : - cleanup transaction interface a bit
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit e1ef2f4a90d4f1740769c3d13702d1033ad3b733 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 15:57:09 2009 +0200 - cleanup transaction interface a bit --- src/solverdebug.c | 127 ++++++++- src/solverdebug.h | 1 + src/transaction.c | 622 +++++++++++++++++++++++++++++------------- src/transaction.h | 38 ++- tests/solver/deptestomatic.c | 21 +- 5 files changed, 587 insertions(+), 222 deletions(-) diff --git a/src/solverdebug.c b/src/solverdebug.c index 85796f5..4ac561f 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -255,7 +255,7 @@ solver_printdecisions(Solver *solv) { Pool *pool = solv->pool; Repo *installed = solv->installed; - Id p; + Id p, type; int i, j; Solvable *s; Queue iq; @@ -275,10 +275,12 @@ solver_printdecisions(Solver *solv) POOL_DEBUG(SAT_DEBUG_RESULT, "transaction:\n"); queue_init(&iq); - for (i = 0; i < solv->trans.steps.count; i += 2) + for (i = 0; i < solv->trans.steps.count; i++) { - s = pool->solvables + solv->trans.steps.elements[i + 1]; - switch(solv->trans.steps.elements[i]) + p = solv->trans.steps.elements[i]; + s = pool->solvables + p; + type = transaction_type(&solv->trans, p, SOLVER_TRANSACTION_SHOW_ACTIVE|SOLVER_TRANSACTION_SHOW_ALL|SOLVER_TRANSACTION_SHOW_OBSOLETES|SOLVER_TRANSACTION_SHOW_MULTIINSTALL); + switch(type) { case SOLVER_TRANSACTION_MULTIINSTALL: POOL_DEBUG(SAT_DEBUG_RESULT, " multi install %s", solvable2str(pool, s)); @@ -299,7 +301,7 @@ solver_printdecisions(Solver *solv) POOL_DEBUG(SAT_DEBUG_RESULT, " change %s", solvable2str(pool, s)); break; case SOLVER_TRANSACTION_UPGRADE: - case SOLVER_TRANSACTION_REPLACE: + case SOLVER_TRANSACTION_OBSOLETES: POOL_DEBUG(SAT_DEBUG_RESULT, " upgrade %s", solvable2str(pool, s)); break; case SOLVER_TRANSACTION_ERASE: @@ -308,7 +310,7 @@ solver_printdecisions(Solver *solv) default: break; } - switch(solv->trans.steps.elements[i]) + switch(type) { case SOLVER_TRANSACTION_INSTALL: case SOLVER_TRANSACTION_ERASE: @@ -318,8 +320,8 @@ solver_printdecisions(Solver *solv) case SOLVER_TRANSACTION_DOWNGRADE: case SOLVER_TRANSACTION_CHANGE: case SOLVER_TRANSACTION_UPGRADE: - case SOLVER_TRANSACTION_REPLACE: - solver_transaction_all_pkgs(&solv->trans, solv->trans.steps.elements[i + 1], &iq); + case SOLVER_TRANSACTION_OBSOLETES: + transaction_all_obs_pkgs(&solv->trans, p, &iq); if (iq.count) { POOL_DEBUG(SAT_DEBUG_RESULT, " (obsoletes"); @@ -389,6 +391,115 @@ solver_printdecisions(Solver *solv) } } +static inline +const char *id2strnone(Pool *pool, Id id) +{ + return !id || id == 1 ? "(none)" : id2str(pool, id); +} + +void +solver_printtransaction(Solver *solv) +{ + Transaction *trans = &solv->trans; + Pool *pool = solv->pool; + Queue classes, pkgs; + int i, j, mode, l, linel; + char line[76]; + const char *n; + + queue_init(&classes); + queue_init(&pkgs); + mode = 0; + transaction_classify(trans, &classes, mode); + for (i = 0; i < classes.count; i += 4) + { + Id class = classes.elements[i]; + Id cnt = classes.elements[i + 1]; + switch(class) + { + case SOLVER_TRANSACTION_ERASE: + POOL_DEBUG(SAT_DEBUG_RESULT, "erased packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_INSTALL: + POOL_DEBUG(SAT_DEBUG_RESULT, "installed packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_REINSTALLED: + POOL_DEBUG(SAT_DEBUG_RESULT, "reinstalled packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_DOWNGRADED: + POOL_DEBUG(SAT_DEBUG_RESULT, "downgraded packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_CHANGED: + POOL_DEBUG(SAT_DEBUG_RESULT, "changed packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_UPGRADED: + POOL_DEBUG(SAT_DEBUG_RESULT, "upgraded packages (%d):\n", cnt); + break; + case SOLVER_TRANSACTION_VENDORCHANGE: + POOL_DEBUG(SAT_DEBUG_RESULT, "vendor change from %s to %s (%d):\n", id2strnone(pool, classes.elements[i + 2]), id2strnone(pool, classes.elements[i + 3]), cnt); + break; + case SOLVER_TRANSACTION_ARCHCHANGE: + POOL_DEBUG(SAT_DEBUG_RESULT, "arch change from %s to %s (%d):\n", id2str(pool, classes.elements[i + 2]), id2str(pool, classes.elements[i + 3]), cnt); + break; + default: + class = SOLVER_TRANSACTION_IGNORE; + break; + } + if (class == SOLVER_TRANSACTION_IGNORE) + continue; + transaction_classify_pkgs(trans, &pkgs, mode, class, classes.elements[i + 2], classes.elements[i + 3]); + *line = 0; + linel = 0; + for (j = 0; j < pkgs.count; j++) + { + Id p = pkgs.elements[j]; + Solvable *s = pool->solvables + p; + Solvable *s2; + + switch(class) + { + case SOLVER_TRANSACTION_DOWNGRADED: + case SOLVER_TRANSACTION_UPGRADED: + s2 = pool->solvables + transaction_obs_pkg(trans, p); + POOL_DEBUG(SAT_DEBUG_RESULT, " - %s -> %s\n", solvable2str(pool, s), solvable2str(pool, s2)); + break; + case SOLVER_TRANSACTION_VENDORCHANGE: + case SOLVER_TRANSACTION_ARCHCHANGE: + n = id2str(pool, s->name); + l = strlen(n); + if (l + linel > sizeof(line) - 3) + { + if (*line) + POOL_DEBUG(SAT_DEBUG_RESULT, " %s\n", line); + *line = 0; + linel = 0; + } + if (l + linel > sizeof(line) - 3) + POOL_DEBUG(SAT_DEBUG_RESULT, " %s\n", n); + else + { + if (*line) + { + strcpy(line + linel, ", "); + linel += 2; + } + strcpy(line + linel, n); + linel += l; + } + break; + default: + POOL_DEBUG(SAT_DEBUG_RESULT, " - %s\n", solvable2str(pool, s)); + break; + } + } + if (*line) + POOL_DEBUG(SAT_DEBUG_RESULT, " %s\n", line); + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + } + queue_free(&classes); + queue_free(&pkgs); +} + void solver_printprobleminfo(Solver *solv, Queue *job, Id problem) { diff --git a/src/solverdebug.h b/src/solverdebug.h index 2b8493b..a581d39 100644 --- a/src/solverdebug.h +++ b/src/solverdebug.h @@ -24,6 +24,7 @@ extern void solver_printruleclass(Solver *solv, int type, Rule *r); extern void solver_printproblem(Solver *solv, Id v); extern void solver_printwatches(Solver *solv, int type); extern void solver_printdecisions(Solver *solv); +extern void solver_printtransaction(Solver *solv); extern void solver_printprobleminfo(Solver *solv, Queue *job, Id problem); extern void solver_printsolutions(Solver *solv, Queue *job); extern void solver_printtrivial(Solver *solv); diff --git a/src/transaction.c b/src/transaction.c index a07ef8e..f5d51b3 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -58,7 +58,7 @@ obsq_sortcmp(const void *ap, const void *bp, void *dp) } void -solver_transaction_all_pkgs(Transaction *trans, Id p, Queue *pkgs) +transaction_all_obs_pkgs(Transaction *trans, Id p, Queue *pkgs) { Pool *pool = trans->pool; Solvable *s = pool->solvables + p; @@ -107,7 +107,7 @@ solver_transaction_all_pkgs(Transaction *trans, Id p, Queue *pkgs) } Id -solver_transaction_pkg(Transaction *trans, Id p) +transaction_obs_pkg(Transaction *trans, Id p) { Pool *pool = trans->pool; Solvable *s = pool->solvables + p; @@ -122,49 +122,163 @@ solver_transaction_pkg(Transaction *trans, Id p) return p < 0 ? -p : p; } queue_init_buffer(&ti, tibuf, sizeof(tibuf)/sizeof(*tibuf)); - solver_transaction_all_pkgs(trans, p, &ti); + transaction_all_obs_pkgs(trans, p, &ti); p = ti.count ? ti.elements[0] : 0; queue_free(&ti); return p; } -/* type filtering, needed if either not all packages are shown + +/* + * calculate base type of transaction element + */ + +static Id +transaction_base_type(Transaction *trans, Id p) +{ + Pool *pool = trans->pool; + Solvable *s, *s2; + int r; + Id p2; + + if (!MAPTST(&trans->transactsmap, p)) + return SOLVER_TRANSACTION_IGNORE; + p2 = transaction_obs_pkg(trans, p); + if (pool->installed && pool->solvables[p].repo == pool->installed) + { + /* erase */ + if (!p2) + return SOLVER_TRANSACTION_ERASE; + s = pool->solvables + p; + s2 = pool->solvables + p2; + if (s->name == s2->name) + { + if (s->evr == s2->evr && solvable_identical(s, s2)) + return SOLVER_TRANSACTION_REINSTALLED; + r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); + if (r < 0) + return SOLVER_TRANSACTION_UPGRADED; + else if (r > 0) + return SOLVER_TRANSACTION_DOWNGRADED; + return SOLVER_TRANSACTION_CHANGED; + } + return SOLVER_TRANSACTION_OBSOLETED; + } + else + { + int noobs = trans->noobsmap.size && MAPTST(&trans->noobsmap, p); + if (noobs) + return p2 ? SOLVER_TRANSACTION_MULTIREINSTALL : SOLVER_TRANSACTION_MULTIINSTALL; + if (!p2) + return SOLVER_TRANSACTION_INSTALL; + s = pool->solvables + p; + s2 = pool->solvables + p2; + if (s->name == s2->name) + { + if (s->evr == s2->evr && solvable_identical(s, s2)) + return SOLVER_TRANSACTION_REINSTALL; + r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); + if (r > 0) + return SOLVER_TRANSACTION_UPGRADE; + else if (r < 0) + return SOLVER_TRANSACTION_DOWNGRADE; + else + return SOLVER_TRANSACTION_CHANGE; + } + return SOLVER_TRANSACTION_OBSOLETES; + } +} + +/* + * return type of transaction element + * + * filtering is needed if either not all packages are shown * or replaces are not shown, as otherwise parts of the * transaction might not be shown to the user */ Id -solver_transaction_show(Transaction *trans, Id type, Id p, int flags) +transaction_type(Transaction *trans, Id p, int mode) { Pool *pool = trans->pool; Solvable *s = pool->solvables + p; Queue oq, rq; - Id q; + Id type, q; int i, j, ref = 0; + if (!s->repo) + return SOLVER_TRANSACTION_IGNORE; + + type = transaction_base_type(trans, p); + + if ((mode & SOLVER_TRANSACTION_RPM_ONLY) != 0) + { + /* application wants to know what to feed to rpm */ + if (type == SOLVER_TRANSACTION_ERASE || type == SOLVER_TRANSACTION_INSTALL || type == SOLVER_TRANSACTION_MULTIINSTALL) + return type; + if (s->repo == pool->installed) + return SOLVER_TRANSACTION_IGNORE; /* ignore as we're being obsoleted */ + if (type == SOLVER_TRANSACTION_MULTIREINSTALL) + return SOLVER_TRANSACTION_MULTIINSTALL; + return SOLVER_TRANSACTION_INSTALL; + } + + if ((mode & SOLVER_TRANSACTION_SHOW_MULTIINSTALL) == 0) + { + /* application wants to make no difference between install + * and multiinstall */ + if (type == SOLVER_TRANSACTION_MULTIINSTALL) + type = SOLVER_TRANSACTION_INSTALL; + if (type == SOLVER_TRANSACTION_MULTIREINSTALL) + type = SOLVER_TRANSACTION_REINSTALL; + } + + if ((mode & SOLVER_TRANSACTION_CHANGE_IS_REINSTALL)) + { + /* application wants to make no difference between change + * and reinstall */ + if (type == SOLVER_TRANSACTION_CHANGED) + type = SOLVER_TRANSACTION_REINSTALLED; + else if (type == SOLVER_TRANSACTION_CHANGE) + type = SOLVER_TRANSACTION_REINSTALL; + } + if (type == SOLVER_TRANSACTION_ERASE || type == SOLVER_TRANSACTION_INSTALL || type == SOLVER_TRANSACTION_MULTIINSTALL) return type; - if (s->repo == pool->installed && (flags & SOLVER_TRANSACTION_SHOW_ACTIVE) == 0) + if (s->repo == pool->installed && (mode & SOLVER_TRANSACTION_SHOW_ACTIVE) == 0) { - /* erase element */ - if ((flags & SOLVER_TRANSACTION_SHOW_REPLACES) == 0 && type == SOLVER_TRANSACTION_REPLACED) + /* erase element and we're showing the passive side */ + if ((mode & SOLVER_TRANSACTION_SHOW_OBSOLETES) == 0 && type == SOLVER_TRANSACTION_OBSOLETED) type = SOLVER_TRANSACTION_ERASE; return type; } - if (s->repo != pool->installed && (flags & SOLVER_TRANSACTION_SHOW_ACTIVE) != 0) + if (s->repo != pool->installed && (mode & SOLVER_TRANSACTION_SHOW_ACTIVE) != 0) { - if ((flags & SOLVER_TRANSACTION_SHOW_REPLACES) == 0 && type == SOLVER_TRANSACTION_REPLACE) + /* install element and we're showing the active side */ + if ((mode & SOLVER_TRANSACTION_SHOW_OBSOLETES) == 0 && type == SOLVER_TRANSACTION_OBSOLETES) type = SOLVER_TRANSACTION_INSTALL; return type; } + /* the element doesn't match the show mode */ + + /* if we're showing all references, we can ignore this package */ + if ((mode & (SOLVER_TRANSACTION_SHOW_ALL|SOLVER_TRANSACTION_SHOW_OBSOLETES)) == (SOLVER_TRANSACTION_SHOW_ALL|SOLVER_TRANSACTION_SHOW_OBSOLETES)) + return SOLVER_TRANSACTION_IGNORE; + + /* we're not showing all refs. check if some other package + * references us. If yes, it's safe to ignore this package, + * otherwise we need to map the type */ + /* most of the time there's only one reference, so check it first */ - q = solver_transaction_pkg(trans, p); - if ((flags & SOLVER_TRANSACTION_SHOW_REPLACES) == 0) + q = transaction_obs_pkg(trans, p); + + if ((mode & SOLVER_TRANSACTION_SHOW_OBSOLETES) == 0) { Solvable *sq = pool->solvables + q; if (sq->name != s->name) { + /* it's a replace but we're not showing replaces. map type. */ if (s->repo == pool->installed) return SOLVER_TRANSACTION_ERASE; else if (type == SOLVER_TRANSACTION_MULTIREINSTALL) @@ -173,26 +287,29 @@ solver_transaction_show(Transaction *trans, Id type, Id p, int flags) return SOLVER_TRANSACTION_INSTALL; } } - if (solver_transaction_pkg(trans, q) == p) - return type; + + /* if there's a match, p will be shown when q + * is processed */ + if (transaction_obs_pkg(trans, q) == p) + return SOLVER_TRANSACTION_IGNORE; /* too bad, a miss. check em all */ queue_init(&oq); queue_init(&rq); - solver_transaction_all_pkgs(trans, p, &oq); + transaction_all_obs_pkgs(trans, p, &oq); for (i = 0; i < oq.count; i++) { q = oq.elements[i]; - if ((flags & SOLVER_TRANSACTION_SHOW_REPLACES) == 0) + if ((mode & SOLVER_TRANSACTION_SHOW_OBSOLETES) == 0) { Solvable *sq = pool->solvables + q; if (sq->name != s->name) continue; } /* check if we are referenced? */ - if ((flags & SOLVER_TRANSACTION_SHOW_ALL) != 0) + if ((mode & SOLVER_TRANSACTION_SHOW_ALL) != 0) { - solver_transaction_all_pkgs(trans, q, &rq); + transaction_all_obs_pkgs(trans, q, &rq); for (j = 0; j < rq.count; j++) if (rq.elements[j] == p) { @@ -202,7 +319,7 @@ solver_transaction_show(Transaction *trans, Id type, Id p, int flags) if (ref) break; } - else if (solver_transaction_pkg(trans, q) == p) + else if (transaction_obs_pkg(trans, q) == p) { ref = 1; break; @@ -213,18 +330,201 @@ solver_transaction_show(Transaction *trans, Id type, Id p, int flags) if (!ref) { + /* we're not referenced. map type */ if (s->repo == pool->installed) - type = SOLVER_TRANSACTION_ERASE; + return SOLVER_TRANSACTION_ERASE; else if (type == SOLVER_TRANSACTION_MULTIREINSTALL) - type = SOLVER_TRANSACTION_MULTIINSTALL; + return SOLVER_TRANSACTION_MULTIINSTALL; else - type = SOLVER_TRANSACTION_INSTALL; + return SOLVER_TRANSACTION_INSTALL; + } + /* there was a ref, so p is shown with some other package */ + return SOLVER_TRANSACTION_IGNORE; +} + + + +static int +classify_cmp(const void *ap, const void *bp, void *dp) +{ + Transaction *trans = dp; + Pool *pool = trans->pool; + const Id *a = ap; + const Id *b = bp; + int r; + + r = a[0] - b[0]; + if (r) + return r; + r = a[2] - b[2]; + if (r) + return a[2] && b[2] ? strcmp(id2str(pool, a[2]), id2str(pool, b[2])) : r; + r = a[3] - b[3]; + if (r) + return a[3] && b[3] ? strcmp(id2str(pool, a[3]), id2str(pool, b[3])) : r; + return 0; +} + +static int +classify_cmp_pkgs(const void *ap, const void *bp, void *dp) +{ + Transaction *trans = dp; + Pool *pool = trans->pool; + Id a = *(Id *)ap; + Id b = *(Id *)bp; + Solvable *sa, *sb; + + sa = pool->solvables + a; + sb = pool->solvables + b; + if (sa->name != sb->name) + return strcmp(id2str(pool, sa->name), id2str(pool, sb->name)); + if (sa->evr != sb->evr) + { + int r = evrcmp(pool, sa->evr, sb->evr, EVRCMP_COMPARE); + if (r) + return r; + } + return a - b; +} + +void +transaction_classify(Transaction *trans, Queue *classes, int mode) +{ + Pool *pool = trans->pool; + int ntypes[SOLVER_TRANSACTION_MAXTYPE]; + Solvable *s, *sq; + Id v, vq, type, p, q; + int i, j; + + queue_empty(classes); + memset(ntypes, 0, sizeof(ntypes)); + /* go through transaction and classify each step */ + for (i = 0; i < trans->steps.count; i++) + { + p = trans->steps.elements[i]; + s = pool->solvables + p; + type = transaction_type(trans, p, mode); + ntypes[type]++; + if (!pool->installed || s->repo != pool->installed) + continue; + /* look at arch/vendor changes */ + q = transaction_obs_pkg(trans, p); + if (!q) + continue; + sq = pool->solvables + q; + + v = s->arch; + vq = sq->arch; + if (v != vq) + { + if ((mode & SOLVER_TRANSACTION_MERGE_ARCHCHANGES) != 0) + v = vq = 0; + for (j = 0; j < classes->count; j += 4) + if (classes->elements[j] == SOLVER_TRANSACTION_ARCHCHANGE && classes->elements[j + 2] == v && classes->elements[j + 3] == vq) + break; + if (j == classes->count) + { + queue_push(classes, SOLVER_TRANSACTION_ARCHCHANGE); + queue_push(classes, 1); + queue_push(classes, v); + queue_push(classes, vq); + } + else + classes->elements[j + 1]++; + } + + v = s->vendor ? s->vendor : 1; + vq = sq->vendor ? sq->vendor : 1; + if (v != vq) + { + if ((mode & SOLVER_TRANSACTION_MERGE_VENDORCHANGES) != 0) + v = vq = 0; + for (j = 0; j < classes->count; j += 4) + if (classes->elements[j] == SOLVER_TRANSACTION_VENDORCHANGE && classes->elements[j + 2] == v && classes->elements[j + 3] == vq) + break; + if (j == classes->count) + { + queue_push(classes, SOLVER_TRANSACTION_VENDORCHANGE); + queue_push(classes, 1); + queue_push(classes, v); + queue_push(classes, vq); + } + else + classes->elements[j + 1]++; + } + } + /* now sort all vendor/arch changes */ + if (classes->count) + sat_sort(classes->elements, classes->count / 4, 4 * sizeof(Id), classify_cmp, trans); + /* finally add all classes. put erases last */ + i = SOLVER_TRANSACTION_ERASE; + if (ntypes[i]) + { + queue_unshift(classes, 0); + queue_unshift(classes, 0); + queue_unshift(classes, ntypes[i]); + queue_unshift(classes, i); } - return type; + for (i = SOLVER_TRANSACTION_MAXTYPE; i > 0; i--) + { + if (!ntypes[i]) + continue; + if (i == SOLVER_TRANSACTION_ERASE) + continue; + queue_unshift(classes, 0); + queue_unshift(classes, 0); + queue_unshift(classes, ntypes[i]); + queue_unshift(classes, i); + } +} + +void +transaction_classify_pkgs(Transaction *trans, Queue *pkgs, int mode, Id class, Id from, Id to) +{ + Pool *pool = trans->pool; + int i; + Id type, p, q; + Solvable *s, *sq; + + queue_empty(pkgs); + for (i = 0; i < trans->steps.count; i++) + { + p = trans->steps.elements[i]; + s = pool->solvables + p; + if (class <= SOLVER_TRANSACTION_MAXTYPE) + { + type = transaction_type(trans, p, mode); + if (type == class) + queue_push(pkgs, p); + continue; + } + if (!pool->installed || s->repo != pool->installed) + continue; + q = transaction_obs_pkg(trans, p); + if (!q) + continue; + sq = pool->solvables + q; + if (class == SOLVER_TRANSACTION_ARCHCHANGE) + { + if ((!from && !to) || (s->arch == from && sq->arch == to)) + queue_push(pkgs, p); + continue; + } + if (class == SOLVER_TRANSACTION_VENDORCHANGE) + { + Id v = s->vendor ? s->vendor : 1; + Id vq = sq->vendor ? sq->vendor : 1; + if ((!from && !to) || (v == from && vq == to)) + queue_push(pkgs, p); + continue; + } + } + if (pkgs->count) + sat_sort(pkgs->elements, pkgs->count, sizeof(Id), classify_cmp_pkgs, trans); } static void -create_transaction_info(Transaction *trans, Queue *decisionq, Map *noobsmap) +create_transaction_info(Transaction *trans, Queue *decisionq) { Pool *pool = trans->pool; Queue *ti = &trans->transaction_info; @@ -234,6 +534,7 @@ create_transaction_info(Transaction *trans, Queue *decisionq, Map *noobsmap) Solvable *s, *s2; queue_empty(ti); + trans->transaction_installed = sat_free(trans->transaction_installed); if (!installed) return; /* no info needed */ for (i = 0; i < decisionq->count; i++) @@ -244,7 +545,7 @@ create_transaction_info(Transaction *trans, Queue *decisionq, Map *noobsmap) s = pool->solvables + p; if (s->repo == installed) continue; - noobs = noobsmap && MAPTST(noobsmap, p); + noobs = trans->noobsmap.size && MAPTST(&trans->noobsmap, p); FOR_PROVIDES(p2, pp2, s->name) { if (!MAPTST(&trans->transactsmap, p2)) @@ -310,19 +611,21 @@ create_transaction_info(Transaction *trans, Queue *decisionq, Map *noobsmap) } } + void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) { Pool *pool = trans->pool; Repo *installed = pool->installed; - int i, r, noobs; - Id p, p2; - Solvable *s, *s2; + int i, neednoobs; + Id p; + Solvable *s; if (noobsmap && !noobsmap->size) noobsmap = 0; /* ignore empty map */ queue_empty(&trans->steps); map_init(&trans->transactsmap, pool->nsolvables); + neednoobs = 0; for (i = 0; i < decisionq->count; i++) { p = decisionq->elements[i]; @@ -332,86 +635,38 @@ transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) if (installed && s->repo == installed && p < 0) MAPSET(&trans->transactsmap, -p); if ((!installed || s->repo != installed) && p > 0) - MAPSET(&trans->transactsmap, p); + { + MAPSET(&trans->transactsmap, p); + if (noobsmap && MAPTST(noobsmap, p)) + neednoobs = 1; + } } - create_transaction_info(trans, decisionq, noobsmap); + MAPCLR(&trans->transactsmap, SYSTEMSOLVABLE); + if (neednoobs) + map_init_clone(&trans->noobsmap, noobsmap); + + create_transaction_info(trans, decisionq); if (installed) { FOR_REPO_SOLVABLES(installed, p, s) { - if (!MAPTST(&trans->transactsmap, p)) - continue; - p2 = solver_transaction_pkg(trans, p); - if (!p2) - queue_push(&trans->steps, SOLVER_TRANSACTION_ERASE); - else - { - s2 = pool->solvables + p2; - if (s->name == s2->name) - { - if (s->evr == s2->evr && solvable_identical(s, s2)) - queue_push(&trans->steps, SOLVER_TRANSACTION_REINSTALLED); - else - { - r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); - if (r < 0) - queue_push(&trans->steps, SOLVER_TRANSACTION_UPGRADED); - else if (r > 0) - queue_push(&trans->steps, SOLVER_TRANSACTION_DOWNGRADED); - else - queue_push(&trans->steps, SOLVER_TRANSACTION_CHANGED); - } - } - else - queue_push(&trans->steps, SOLVER_TRANSACTION_REPLACED); - } - queue_push(&trans->steps, p); + if (MAPTST(&trans->transactsmap, p)) + queue_push(&trans->steps, p); } } for (i = 0; i < decisionq->count; i++) { p = decisionq->elements[i]; - if (p < 0 || p == SYSTEMSOLVABLE) - continue; - s = pool->solvables + p; - if (installed && s->repo == installed) - continue; - noobs = noobsmap && MAPTST(noobsmap, p); - p2 = solver_transaction_pkg(trans, p); - if (noobs) - queue_push(&trans->steps, p2 ? SOLVER_TRANSACTION_MULTIREINSTALL : SOLVER_TRANSACTION_MULTIINSTALL); - else if (!p2) - queue_push(&trans->steps, SOLVER_TRANSACTION_INSTALL); - else - { - s2 = pool->solvables + p2; - if (s->name == s2->name) - { - if (s->evr == s2->evr && solvable_identical(s, s2)) - queue_push(&trans->steps, SOLVER_TRANSACTION_REINSTALL); - else - { - r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); - if (r > 0) - queue_push(&trans->steps, SOLVER_TRANSACTION_UPGRADE); - else if (r < 0) - queue_push(&trans->steps, SOLVER_TRANSACTION_DOWNGRADE); - else - queue_push(&trans->steps, SOLVER_TRANSACTION_CHANGE); - } - } - else - queue_push(&trans->steps, SOLVER_TRANSACTION_REPLACE); - } - queue_push(&trans->steps, p); + if (p > 0 && MAPTST(&trans->transactsmap, p)) + queue_push(&trans->steps, p); } } + struct _TransactionElement { Id p; /* solvable id */ - Id type; /* installation type */ Id edges; /* pointer into edges data */ Id mark; }; @@ -450,6 +705,7 @@ transaction_free(Transaction *trans) queue_free(&trans->transaction_info); trans->transaction_installed = sat_free(trans->transaction_installed); map_free(&trans->transactsmap); + map_free(&trans->noobsmap); if (trans->orderdata) { struct _TransactionOrderdata *od = trans->orderdata; @@ -541,7 +797,7 @@ addedge(struct orderdata *od, Id from, Id to, int type) Id tibuf[5]; queue_init_buffer(&ti, tibuf, sizeof(tibuf)/sizeof(*tibuf)); - solver_transaction_all_pkgs(trans, from, &ti); + transaction_all_obs_pkgs(trans, from, &ti); for (i = 0; i < ti.count; i++) ret |= addedge(od, ti.elements[i], to, type); queue_free(&ti); @@ -561,7 +817,7 @@ addedge(struct orderdata *od, Id from, Id to, int type) Id tibuf[5]; queue_init_buffer(&ti, tibuf, sizeof(tibuf)/sizeof(*tibuf)); - solver_transaction_all_pkgs(trans, to, &ti); + transaction_all_obs_pkgs(trans, to, &ti); for (i = 0; i < ti.count; i++) ret |= addedge(od, from, ti.elements[i], type); queue_free(&ti); @@ -610,9 +866,9 @@ havechoice(struct orderdata *od, Id p, Id q1, Id q2) if (trans->transaction_installed[q1 - pool->installed->start] > 0 && trans->transaction_installed[q2 - pool->installed->start] > 0) return 1; queue_init_buffer(&ti1, ti1buf, sizeof(ti1buf)/sizeof(*ti1buf)); - solver_transaction_all_pkgs(trans, q1, &ti1); + transaction_all_obs_pkgs(trans, q1, &ti1); queue_init_buffer(&ti2, ti2buf, sizeof(ti2buf)/sizeof(*ti2buf)); - solver_transaction_all_pkgs(trans, q2, &ti2); + transaction_all_obs_pkgs(trans, q2, &ti2); for (i = 0; i < ti1.count; i++) for (j = 0; j < ti2.count; j++) if (ti1.elements[i] == ti2.elements[j]) @@ -921,17 +1177,17 @@ breakcycle(struct orderdata *od, Id *cycle) /* cycle recorded, print it */ if (ddegmin >= TYPE_REQ && (ddegmax & TYPE_PREREQ) != 0) - printf("CRITICAL "); - printf("cycle: --> "); + POOL_DEBUG(SAT_DEBUG_STATS, "CRITICAL "); + POOL_DEBUG(SAT_DEBUG_STATS, "cycle: --> "); for (k = 0; cycle[k + 1]; k += 2) { te = od->tes + cycle[k]; if ((od->edgedata[cycle[k + 1] + 1] & TYPE_BROKEN) != 0) - printf("%s ##%x##> ", solvid2str(pool, te->p), od->edgedata[cycle[k + 1] + 1]); + POOL_DEBUG(SAT_DEBUG_STATS, "%s ##%x##> ", solvid2str(pool, te->p), od->edgedata[cycle[k + 1] + 1]); else - printf("%s --%x--> ", solvid2str(pool, te->p), od->edgedata[cycle[k + 1] + 1]); + POOL_DEBUG(SAT_DEBUG_STATS, "%s --%x--> ", solvid2str(pool, te->p), od->edgedata[cycle[k + 1] + 1]); } - printf("\n"); + POOL_DEBUG(SAT_DEBUG_STATS, "\n"); } static inline void @@ -946,18 +1202,18 @@ dump_tes(struct orderdata *od) for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) { Solvable *s = pool->solvables + te->p; - printf("TE %4d: %c%s\n", i, s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); + POOL_DEBUG(SAT_WARN, "TE %4d: %c%s\n", i, s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); if (s->repo != pool->installed) { queue_empty(&obsq); - solver_transaction_all_pkgs(od->trans, te->p, &obsq); + transaction_all_obs_pkgs(od->trans, te->p, &obsq); for (j = 0; j < obsq.count; j++) - printf(" -%s\n", solvid2str(pool, obsq.elements[j])); + POOL_DEBUG(SAT_WARN, " -%s\n", solvid2str(pool, obsq.elements[j])); } for (j = te->edges; od->edgedata[j]; j += 2) { te2 = od->tes + od->edgedata[j]; - printf(" --%x--> TE %4d: %s\n", od->edgedata[j + 1], od->edgedata[j], solvid2str(pool, te2->p)); + POOL_DEBUG(SAT_WARN, " --%x--> TE %4d: %s\n", od->edgedata[j + 1], od->edgedata[j], solvid2str(pool, te2->p)); } } } @@ -1115,14 +1371,15 @@ transaction_order(Transaction *trans, int flags) Pool *pool = trans->pool; Queue *tr = &trans->steps; Repo *installed = pool->installed; - Id type, p; + Id p; Solvable *s; int i, j, k, numte, numedge; struct orderdata od; struct _TransactionElement *te; Queue todo, obsq, samerepoq, uninstq; int cycstart, cycel; - Id *cycle, *obstypes; + Id *cycle; + unsigned char *obsoleted; int oldcount; int start, now; Repo *lastrepo; @@ -1142,9 +1399,9 @@ transaction_order(Transaction *trans, int flags) /* create a transaction element for every active component */ numte = 0; - for (i = 0; i < tr->count; i += 2) + for (i = 0; i < tr->count; i++) { - p = tr->elements[i + 1]; + p = tr->elements[i]; s = pool->solvables + p; if (installed && s->repo == installed && trans->transaction_installed[p - installed->start]) continue; @@ -1164,24 +1421,20 @@ transaction_order(Transaction *trans, int flags) od.nedgedata = 1; queue_init(&od.cycles); - for (i = 0, te = od.tes + 1; i < tr->count; i += 2) + /* initialize TEs */ + for (i = 0, te = od.tes + 1; i < tr->count; i++) { - p = tr->elements[i + 1]; + p = tr->elements[i]; s = pool->solvables + p; if (installed && s->repo == installed && trans->transaction_installed[p - installed->start]) continue; te->p = p; - te->type = tr->elements[i]; te++; } /* create dependency graph */ - for (i = 0; i < tr->count; i += 2) - { - type = tr->elements[i]; - p = tr->elements[i + 1]; - addsolvableedges(&od, pool->solvables + p); - } + for (i = 0; i < tr->count; i++) + addsolvableedges(&od, pool->solvables + tr->elements[i]); /* count edges */ numedge = 0; @@ -1347,18 +1600,9 @@ transaction_order(Transaction *trans, int flags) } assert(todo.count > 0 || uninstq.count > 0); if (installed) - { - obstypes = sat_calloc(installed->end - installed->start, sizeof(Id)); - for (i = 0; i < tr->count; i += 2) - { - p = tr->elements[i + 1]; - s = pool->solvables + p; - if (s->repo == installed && trans->transaction_installed[p - installed->start]) - obstypes[p - installed->start] = tr->elements[i]; - } - } + obsoleted = sat_calloc(installed->end - installed->start, 1); else - obstypes = 0; + obsoleted = 0; oldcount = tr->count; queue_empty(tr); @@ -1414,7 +1658,6 @@ transaction_order(Transaction *trans, int flags) break; te = od.tes + i; - queue_push(tr, te->type); queue_push(tr, te->p); #if 0 printf("do %s [%d]\n", solvid2str(pool, te->p), temedianr[i]); @@ -1423,16 +1666,15 @@ printf("do %s [%d]\n", solvid2str(pool, te->p), temedianr[i]); if (installed && s->repo != installed) { queue_empty(&obsq); - solver_transaction_all_pkgs(trans, te->p, &obsq); + transaction_all_obs_pkgs(trans, te->p, &obsq); for (j = 0; j < obsq.count; j++) { p = obsq.elements[j]; assert(p >= installed->start && p < installed->end); - if (obstypes[p - installed->start]) + if (!obsoleted[p - installed->start]) { - queue_push(tr, obstypes[p - installed->start]); queue_push(tr, p); - obstypes[p - installed->start] = 0; + obsoleted[p - installed->start] = 1; } } } @@ -1455,7 +1697,7 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) } } } - sat_free(obstypes); + sat_free(obsoleted); sat_free(temedianr); queue_free(&todo); queue_free(&samerepoq); @@ -1481,6 +1723,51 @@ printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]) } } + +int +transaction_order_add_choices(Transaction *trans, Queue *choices, Id chosen) +{ + int i, j; + struct _TransactionOrderdata *od = trans->orderdata; + struct _TransactionElement *te; + + if (!od) + return choices->count; + if (!chosen) + { + /* initialization step */ + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + te->mark = 0; + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + { + for (j = te->edges; od->invedgedata[j]; j++) + od->tes[od->invedgedata[j]].mark++; + } + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + if (!te->mark) + queue_push(choices, te->p); + return choices->count; + } + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + if (te->p == chosen) + break; + if (i == od->ntes) + return choices->count; + if (te->mark > 0) + { + /* hey! out-of-order installation! */ + te->mark = -1; + } + for (j = te->edges; od->invedgedata[j]; j++) + { + te = od->tes + od->invedgedata[j]; + assert(te->mark > 0 || te->mark == -1); + if (te->mark > 0 && --te->mark == 0) + queue_push(choices, te->p); + } + return choices->count; +} + static void transaction_check_pkg(Transaction *trans, Id tepkg, Id pkg, Map *ins, Map *seen, int onlyprereq, Id noconfpkg, int depth) { @@ -1547,32 +1834,31 @@ transaction_check_pkg(Transaction *trans, Id tepkg, Id pkg, Map *ins, Map *seen, } if (!good) { - printf(" %c%s: nothing provides %s needed by %c%s\n", pool->solvables[tepkg].repo == pool->installed ? '-' : '+', solvid2str(pool, tepkg), dep2str(pool, req), s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); + POOL_DEBUG(SAT_WARN, " %c%s: nothing provides %s needed by %c%s\n", pool->solvables[tepkg].repo == pool->installed ? '-' : '+', solvid2str(pool, tepkg), dep2str(pool, req), s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); } } } } void -transaction_check(Transaction *trans) +transaction_check_order(Transaction *trans) { Pool *pool = trans->pool; Solvable *s; - Id p, type, lastins; + Id p, lastins; Map ins, seen; int i; - printf("\nchecking transaction order...\n"); + POOL_DEBUG(SAT_WARN, "\nchecking transaction order...\n"); map_init(&ins, pool->nsolvables); map_init(&seen, pool->nsolvables); if (pool->installed) FOR_REPO_SOLVABLES(pool->installed, p, s) MAPSET(&ins, p); lastins = 0; - for (i = 0; i < trans->steps.count; i += 2) + for (i = 0; i < trans->steps.count; i++) { - type = trans->steps.elements[i]; - p = trans->steps.elements[i + 1]; + p = trans->steps.elements[i]; s = pool->solvables + p; if (s->repo != pool->installed) lastins = p; @@ -1588,55 +1874,5 @@ transaction_check(Transaction *trans) } map_free(&seen); map_free(&ins); - printf("transaction order check done.\n"); -} - -int -transaction_add_choices(Transaction *trans, Queue *choices, Id chosen) -{ - int i, j; - struct _TransactionOrderdata *od = trans->orderdata; - struct _TransactionElement *te; - - if (!od) - return choices->count; - if (!chosen) - { - /* initialization step */ - for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) - te->mark = 0; - for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) - { - for (j = te->edges; od->invedgedata[j]; j++) - od->tes[od->invedgedata[j]].mark++; - } - for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) - if (!te->mark) - { - queue_push(choices, te->type); - queue_push(choices, te->p); - } - return choices->count; - } - for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) - if (te->p == chosen) - break; - if (i == od->ntes) - return choices->count; - if (te->mark > 0) - { - /* hey! out-of-order installation! */ - te->mark = -1; - } - for (j = te->edges; od->invedgedata[j]; j++) - { - te = od->tes + od->invedgedata[j]; - assert(te->mark > 0 || te->mark == -1); - if (te->mark > 0 && --te->mark == 0) - { - queue_push(choices, te->type); - queue_push(choices, te->p); - } - } - return choices->count; + POOL_DEBUG(SAT_WARN, "transaction order check done.\n"); } diff --git a/src/transaction.h b/src/transaction.h index 0099c84..2e0a130 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -32,6 +32,7 @@ typedef struct _Transaction { Queue transaction_info; Id *transaction_installed; Map transactsmap; + Map noobsmap; struct _TransactionOrderdata *orderdata; @@ -39,37 +40,54 @@ typedef struct _Transaction { /* step types */ +#define SOLVER_TRANSACTION_IGNORE 0x00 + #define SOLVER_TRANSACTION_ERASE 0x10 #define SOLVER_TRANSACTION_REINSTALLED 0x11 #define SOLVER_TRANSACTION_DOWNGRADED 0x12 #define SOLVER_TRANSACTION_CHANGED 0x13 #define SOLVER_TRANSACTION_UPGRADED 0x14 -#define SOLVER_TRANSACTION_REPLACED 0x15 +#define SOLVER_TRANSACTION_OBSOLETED 0x15 #define SOLVER_TRANSACTION_INSTALL 0x20 #define SOLVER_TRANSACTION_REINSTALL 0x21 #define SOLVER_TRANSACTION_DOWNGRADE 0x22 #define SOLVER_TRANSACTION_CHANGE 0x23 #define SOLVER_TRANSACTION_UPGRADE 0x24 -#define SOLVER_TRANSACTION_REPLACE 0x25 +#define SOLVER_TRANSACTION_OBSOLETES 0x25 #define SOLVER_TRANSACTION_MULTIINSTALL 0x30 #define SOLVER_TRANSACTION_MULTIREINSTALL 0x31 +#define SOLVER_TRANSACTION_MAXTYPE 0x3f + /* show modes */ -#define SOLVER_TRANSACTION_SHOW_ACTIVE (1 << 0) -#define SOLVER_TRANSACTION_SHOW_ALL (1 << 1) -#define SOLVER_TRANSACTION_SHOW_REPLACES (1 << 2) +#define SOLVER_TRANSACTION_SHOW_ACTIVE (1 << 0) +#define SOLVER_TRANSACTION_SHOW_ALL (1 << 1) +#define SOLVER_TRANSACTION_SHOW_OBSOLETES (1 << 2) +#define SOLVER_TRANSACTION_SHOW_MULTIINSTALL (1 << 3) +#define SOLVER_TRANSACTION_CHANGE_IS_REINSTALL (1 << 4) +#define SOLVER_TRANSACTION_MERGE_VENDORCHANGES (1 << 5) +#define SOLVER_TRANSACTION_MERGE_ARCHCHANGES (1 << 6) + +#define SOLVER_TRANSACTION_RPM_ONLY (1 << 7) + +/* extra classifications */ +#define SOLVER_TRANSACTION_ARCHCHANGE 0x100 +#define SOLVER_TRANSACTION_VENDORCHANGE 0x101 extern void transaction_init(Transaction *trans, struct _Pool *pool); extern void transaction_free(Transaction *trans); extern void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap); -extern void solver_transaction_all_pkgs(Transaction *trans, Id p, Queue *pkgs); -extern Id solver_transaction_pkg(Transaction *trans, Id p); -extern Id solver_transaction_show(Transaction *trans, Id type, Id p, int mode); +extern void transaction_all_obs_pkgs(Transaction *trans, Id p, Queue *pkgs); +extern Id transaction_obs_pkg(Transaction *trans, Id p); +extern Id transaction_type(Transaction *trans, Id p, int mode); +extern void transaction_classify(Transaction *trans, Queue *classes, int mode); +extern void transaction_classify_pkgs(Transaction *trans, Queue *pkgs, int mode, Id class, Id from, Id to); + extern void transaction_order(Transaction *trans, int flags); -extern void transaction_check(Transaction *trans); -extern int transaction_add_choices(Transaction *trans, Queue *choices, Id chosen); +extern int transaction_order_add_choices(Transaction *trans, Queue *choices, Id chosen); +extern void transaction_check_order(Transaction *trans); /* order flags */ #define SOLVER_TRANSACTION_KEEP_ORDERDATA (1 << 0) diff --git a/tests/solver/deptestomatic.c b/tests/solver/deptestomatic.c index d310c2d..7fea99c 100644 --- a/tests/solver/deptestomatic.c +++ b/tests/solver/deptestomatic.c @@ -54,8 +54,8 @@ transaction_sortcmp(const void *ap, const void *bp, void *dp) { Pool *pool = dp; int r; - Id a = ((Id *)ap)[1]; - Id b = ((Id *)bp)[1]; + Id a = *(Id *)ap; + Id b = *(Id *)bp; Solvable *sa = pool->solvables + a; Solvable *sb = pool->solvables + b; @@ -1535,8 +1535,8 @@ endElement( void *userData, const char *name ) rc_printdecisions(solv, &pd->trials); #if 1 transaction_order(&solv->trans, 0); - transaction_check(&solv->trans); - solver_printdecisions(solv); + transaction_check_order(&solv->trans); + solver_printtransaction(solv); #endif } // clean up @@ -1630,14 +1630,13 @@ rc_printdecisions(Solver *solv, Queue *job) int installs = 0, uninstalls = 0, upgrades = 0; Id type, p; - sat_sort(trans->steps.elements, trans->steps.count / 2, 2 * sizeof(Id), transaction_sortcmp, pool); + sat_sort(trans->steps.elements, trans->steps.count, sizeof(Id), transaction_sortcmp, pool); - for (i = 0; i < trans->steps.count; i += 2) + for (i = 0; i < trans->steps.count; i++) { - type = trans->steps.elements[i]; - p = trans->steps.elements[i + 1]; - s = pool->solvables + trans->steps.elements[i + 1]; - type = solver_transaction_show(trans, type, p, 0); + p = trans->steps.elements[i]; + s = pool->solvables + p; + type = transaction_type(trans, p, 0); switch(type) { case SOLVER_TRANSACTION_INSTALL: @@ -1665,7 +1664,7 @@ rc_printdecisions(Solver *solv, Queue *job) printf(">!> upgrade %s-%s => ", id2str(pool, s->name), id2str(pool, s->evr)); else printf(">!> upgrade %s-%s.%s => ", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); - s = pool->solvables + solver_transaction_pkg(trans, trans->steps.elements[i + 1]); + s = pool->solvables + transaction_obs_pkg(trans, p); if (redcarpet) printf("%s-%s%s", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); else -- 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] <sat-solver> master : fix indent
by Dirk Mueller 15 Jun '09

15 Jun '09

ref: refs/heads/master commit a404682aaed1e56452ab99e662f3cd7276759dba Author: Dirk Mueller <dmueller(a)suse.de> Date: Mon Jun 15 15:11:03 2009 +0200 fix indent --- tools/installcheck.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/installcheck.c b/tools/installcheck.c index cf3c750..9701ae0 100644 --- a/tools/installcheck.c +++ b/tools/installcheck.c @@ -60,9 +60,8 @@ myfopen(const char *fn) void usage(char** argv) { - printf("Usage:\n%s: <arch> repo [--nocheck repo]...\n", - argv[0]); - exit(1); + printf("Usage:\n%s: <arch> repo [--nocheck repo]...\n", argv[0]); + exit(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] <sat-solver> master : properly support REPOKEY_TYPE_IDARRAY
by Klaus Kämpf 15 Jun '09

15 Jun '09

ref: refs/heads/master commit 1c9f64eb49c3abc994a219e6f60086e631addd6d Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Mon Jun 15 14:28:30 2009 +0200 properly support REPOKEY_TYPE_IDARRAY plus sample usage (for repository:addedfileprovides) Perl does not work correctly (probably due to my lack of Perl knowledge) --- bindings/perl/tests/repo.pl | 2 ++ bindings/python/tests/repo.py | 1 + bindings/ruby/tests/repodata.rb | 6 ++++-- bindings/satsolver.i | 27 +++++++++++---------------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bindings/perl/tests/repo.pl b/bindings/perl/tests/repo.pl index 6e03c69..cadc480 100644 --- a/bindings/perl/tests/repo.pl +++ b/bindings/perl/tests/repo.pl @@ -26,3 +26,5 @@ print "Repo \"" . $repo->name() . "\" size " . $repo->size() . ", count " . $rep my $timestamp = $repo->attr("repository:timestamp"); print "Timestamp: " . $timestamp . "\n"; + +print "Addedfileprovides: " . $repo->attr("repository:addedfileprovides") . "\n"; diff --git a/bindings/python/tests/repo.py b/bindings/python/tests/repo.py index 8461da7..c0737ec 100644 --- a/bindings/python/tests/repo.py +++ b/bindings/python/tests/repo.py @@ -83,6 +83,7 @@ class TestSequenceFunctions(unittest.TestCase): assert pool pool.set_arch("i686") repo = pool.add_solv( "../../testdata/os11-biarch.solv" ) + print "Addedfileprovides ", repo.attr("repository:addedfileprovides") for s in pool.providers("glibc"): print s, "provides 'glibc'" assert True diff --git a/bindings/ruby/tests/repodata.rb b/bindings/ruby/tests/repodata.rb index cfafb0c..71a15c3 100644 --- a/bindings/ruby/tests/repodata.rb +++ b/bindings/ruby/tests/repodata.rb @@ -19,7 +19,7 @@ class RepodataTest < Test::Unit::TestCase repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - puts "Repo has #{repo.datasize} Repodatas attached" +# puts "Repo has #{repo.datasize} Repodatas attached" assert repo.datasize > 0 assert repo.data(-1) == nil assert repo.data(repo.datasize) == nil @@ -36,11 +36,13 @@ class RepodataTest < Test::Unit::TestCase puts " Key '#{k.name}' is #{k.type}[#{k.type_id}] with #{k.size} bytes" } + puts "repository:addedfileprovides: #{repo.attr('repository:addedfileprovides').inspect}" + i = 0 repo.each { |s| bt = s['solvable:buildtime'] bt = Time.at(bt) if bt.is_a? Fixnum - puts "Solvable #{s}: group #{s['solvable:group']}, time #{bt}, downloadsize #{s['solvable:downloadsize']}, installsize #{s['solvable:installsize']}" +# puts "Solvable #{s}: group #{s['solvable:group']}, time #{bt}, downloadsize #{s['solvable:downloadsize']}, installsize #{s['solvable:installsize']}" i += 1 break if i == 10 } diff --git a/bindings/satsolver.i b/bindings/satsolver.i index 92178a0..562a94e 100644 --- a/bindings/satsolver.i +++ b/bindings/satsolver.i @@ -246,10 +246,17 @@ dataiterator_value( Dataiterator *di ) value = Swig_String( di->kv.str ); break; case REPOKEY_TYPE_IDARRAY: - if (di->data && di->data->localpool) - value = Swig_String(stringpool_id2str( &di->data->spool, di->kv.id )); - else - value = Swig_String(id2str( di->repo->pool, di->kv.id )); + { + Swig_Type result = Swig_Array(); + do { + if (di->data && di->data->localpool) + Swig_Append( result, Swig_String( stringpool_id2str(&di->data->spool, di->kv.id ) ) ); + else + Swig_Append( result, Swig_String( id2str( di->repo->pool, di->kv.id ) ) ); + } + while (dataiterator_step(di)); + value = result; + } break; case REPOKEY_TYPE_REL_IDARRAY: fprintf(stderr, "REPOKEY_TYPE_REL_IDARRAY: unhandled\n"); @@ -288,18 +295,6 @@ dataiterator_value( Dataiterator *di ) fprintf(stderr, "Unhandled type %d\n", di->key->type); } return value; -#if 0 - Swig_Type result = Swig_Array(); - if (di->data && di->data->localpool) - Swig_Append( result, Swig_String( stringpool_id2str( &di->data->spool, di->key->name ) ) ); - else - Swig_Append( result, Swig_String( id2str( di->repo->pool, di->key->name ) ) ); - Swig_Append( result, value ); - - value = Swig_Null; - - return result; -#endif } -- 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] <sat-solver> master : Provide problems_count
by Klaus Kämpf 15 Jun '09

15 Jun '09

ref: refs/heads/master commit 73d683fa71420e82532f3d5f8f0962ac39be584b Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Mon Jun 15 13:36:11 2009 +0200 Provide problems_count --- bindings/solver.i | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bindings/solver.i b/bindings/solver.i index 33f9e70..80fc3bb 100644 --- a/bindings/solver.i +++ b/bindings/solver.i @@ -896,9 +896,6 @@ typedef struct solver {} Solver; * Returns true if any problems occured during solve, returns false * on successful solve. * - * There is no 'number of problems' available, but it can be computed - * by iterating over the problems. - * * call-seq: * solver.problems? -> bool * @@ -906,6 +903,13 @@ typedef struct solver {} Solver; int problems_found() { return $self->problems.count != 0; } + /* + * Return number of problems + * + */ + int problems_count() + { return (int)solver_problem_count($self); } + #if defined(SWIGRUBY) /* * Iterate over problems. -- 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] <sat-solver> master : print vendor
by Klaus Kämpf 15 Jun '09

15 Jun '09

ref: refs/heads/master commit abddd4a80ef63799cddae3374db471c837f4a3eb Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Mon Jun 15 13:35:42 2009 +0200 print vendor --- bindings/python/tests/rpmdb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bindings/python/tests/rpmdb.py b/bindings/python/tests/rpmdb.py index 2aad81a..9fb85b2 100644 --- a/bindings/python/tests/rpmdb.py +++ b/bindings/python/tests/rpmdb.py @@ -30,7 +30,7 @@ class TestSequenceFunctions(unittest.TestCase): i = 0 name = None for s in pool: - print s + print s, " Vendor: ", s.vendor() if i == 7: name = s.name() i += 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] <sat-solver> master : Provide solutions_count
by Klaus Kämpf 15 Jun '09

15 Jun '09

ref: refs/heads/master commit 0eacdad48ac1af50c3b1cc1c548fbf10401d5b7b Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Mon Jun 15 13:34:43 2009 +0200 Provide solutions_count --- bindings/problem.i | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/bindings/problem.i b/bindings/problem.i index f13a6ff..1033cd4 100644 --- a/bindings/problem.i +++ b/bindings/problem.i @@ -100,6 +100,13 @@ typedef struct _Problem {} Problem; { return xsolvable_new( $self->solver->pool, $self->target ); } /* + * Number of available solutions for problem + * + */ + int solutions_count() + { return solver_solution_count( $self->solver, $self->id ); } + + /* * An iterator providing possible Solutions to the Problem * * call-seq: -- 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] <libzypp> SuSE-Code-11-Branch : changes 5.30.5
by Michael Andres 15 Jun '09

15 Jun '09

ref: refs/heads/SuSE-Code-11-Branch commit b6e9b4d75076c9f13b61d602de73f95cb8aedcec Author: Michael Andres <ma(a)suse.de> Date: Mon Jun 15 12:18:50 2009 +0200 changes 5.30.5 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index d5f4b95..4598419 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,8 +51,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "30") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") # -# LAST RELEASED: 5.30.4 (23) +# LAST RELEASED: 5.30.5 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index fbfbfa9..dea1958 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 15 12:17:40 CEST 2009 - ma(a)suse.de + +- Use rpm variables in specfile. (bnc #512466) +- version 5.30.5 (23) + +------------------------------------------------------------------- Tue Jun 2 12:45:21 CEST 2009 - ma(a)suse.de - Fix to compile with -Werror=format-security -- 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] <libzypp> SuSE-Code-11-Branch : Use rpm variables in specfile.
by Michael Andres 15 Jun '09

15 Jun '09

ref: refs/heads/SuSE-Code-11-Branch commit 150069deceddf10f1e0bbebb6e55f36cae295f53 Author: Michael Andres <ma(a)suse.de> Date: Mon Jun 15 12:15:04 2009 +0200 Use rpm variables in specfile. --- libzypp.spec.cmake | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 3e28637..fb06bfd 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -18,8 +18,8 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: @VERSION@ Release: 0 -Source: @PACKAGE@-@VERSION@.tar.bz2 -Source1: @PACKAGE@-rpmlintrc +Source: %{name}-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -74,7 +74,7 @@ Authors: Ladislav Slezak <lslezak(a)suse.cz> %package devel -Requires: libzypp == @VERSION@ +Requires: libzypp == %{version} Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.13.0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0