April 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <zypper> master : color/highlight config option introduced
by Ján Kupec 25 Apr '09

25 Apr '09

ref: refs/heads/master commit 409db76f2bd6f6ab47fc35b41ea9bdd35022f6ac Author: Ján Kupec <jkupec(a)suse.cz> Date: Sat Apr 25 22:41:51 2009 +0200 color/highlight config option introduced --- src/Config.cc | 10 ++++++++++ src/Config.h | 3 +++ src/utils/colors.cc | 2 ++ src/utils/colors.h | 1 + zypper.conf | 11 ++++++++++- 5 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/Config.cc b/src/Config.cc index 91ecf1e..99be31c 100644 --- a/src/Config.cc +++ b/src/Config.cc @@ -41,6 +41,7 @@ const ConfigOption ConfigOption::COLOR_MSG_ERROR(ConfigOption::COLOR_MSG_ERROR_e const ConfigOption ConfigOption::COLOR_MSG_WARNING(ConfigOption::COLOR_MSG_WARNING_e); const ConfigOption ConfigOption::COLOR_POSITIVE(ConfigOption::COLOR_POSITIVE_e); const ConfigOption ConfigOption::COLOR_NEGATIVE(ConfigOption::COLOR_NEGATIVE_e); +const ConfigOption ConfigOption::COLOR_HIGHLIGHT(ConfigOption::COLOR_HIGHLIGHT_e); const ConfigOption ConfigOption::COLOR_PROMPT_OPTION(ConfigOption::COLOR_PROMPT_OPTION_e); const ConfigOption ConfigOption::COLOR_PROMPT_SHORTHAND(ConfigOption::COLOR_PROMPT_SHORTHAND_e); @@ -62,6 +63,7 @@ ConfigOption::Option ConfigOption::parse(const std::string & strval_r) _table["color/msgWarning"] = ConfigOption::COLOR_MSG_WARNING_e; _table["color/positive"] = ConfigOption::COLOR_POSITIVE_e; _table["color/negative"] = ConfigOption::COLOR_NEGATIVE_e; + _table["color/highlight"] = ConfigOption::COLOR_HIGHLIGHT_e; _table["color/promptOption"] = ConfigOption::COLOR_PROMPT_OPTION_e; } map<string, ConfigOption::Option>::const_iterator it = _table.find(strval_r); @@ -88,6 +90,7 @@ const string ConfigOption::asString() const _table_str[COLOR_MSG_WARNING_e] = "color/msgWarning"; _table_str[COLOR_POSITIVE_e] = "color/positive"; _table_str[COLOR_NEGATIVE_e] = "color/negative"; + _table_str[COLOR_HIGHLIGHT_e] = "color/highlight"; _table_str[COLOR_PROMPT_OPTION_e] = "color/promptOption"; } map<ConfigOption::Option, string>::const_iterator it = _table_str.find(_value); @@ -108,6 +111,7 @@ Config::Config() , color_msgWarning ("yellow") , color_positive ("green") , color_negative ("red") + , color_highlight ("cyan") , color_promptOption("grey") {} @@ -205,6 +209,12 @@ void Config::read() if (!c.value().empty()) color_negative = c; + ////// color/highlight ////// + + c = Color(augeas.getOption(ConfigOption::COLOR_HIGHLIGHT.asString())); + if (!c.value().empty()) + color_highlight = c; + ////// color/colorPromptOption ////// c = Color(augeas.getOption(ConfigOption::COLOR_PROMPT_OPTION.asString())); diff --git a/src/Config.h b/src/Config.h index 5871e2b..402387f 100644 --- a/src/Config.h +++ b/src/Config.h @@ -25,6 +25,7 @@ public: static const ConfigOption COLOR_MSG_WARNING; static const ConfigOption COLOR_POSITIVE; static const ConfigOption COLOR_NEGATIVE; + static const ConfigOption COLOR_HIGHLIGHT; static const ConfigOption COLOR_PROMPT_OPTION; static const ConfigOption COLOR_PROMPT_SHORTHAND; @@ -40,6 +41,7 @@ public: COLOR_MSG_WARNING_e, COLOR_POSITIVE_e, COLOR_NEGATIVE_e, + COLOR_HIGHLIGHT_e, COLOR_PROMPT_OPTION_e, COLOR_PROMPT_SHORTHAND_e }; @@ -94,6 +96,7 @@ struct Config Color color_msgWarning; Color color_positive; Color color_negative; + Color color_highlight; Color color_promptOption; }; diff --git a/src/utils/colors.cc b/src/utils/colors.cc index 1bc5d0f..02d1c51 100644 --- a/src/utils/colors.cc +++ b/src/utils/colors.cc @@ -89,6 +89,8 @@ static const string get_color(const Config & conf, const ColorContext context) return conf.color_negative.value(); case COLOR_CONTEXT_PROMPT_OPTION: return conf.color_promptOption.value(); + case COLOR_CONTEXT_HIGHLIGHT: + return conf.color_highlight.value(); default: return COLOR_RESET; } diff --git a/src/utils/colors.h b/src/utils/colors.h index c2d84ab..adda775 100644 --- a/src/utils/colors.h +++ b/src/utils/colors.h @@ -56,6 +56,7 @@ typedef enum zypper_color_contexts COLOR_CONTEXT_NEGATIVE = 6, COLOR_CONTEXT_PROMPT_OPTION = 7, COLOR_CONTEXT_PROMPT_SHORTHAND = 8, + COLOR_CONTEXT_HIGHLIGHT = 9, COLOR_CONTEXT_DEFAULT = -1 } ColorContext; diff --git a/zypper.conf b/zypper.conf index 98ecc21..d575a84 100644 --- a/zypper.conf +++ b/zypper.conf @@ -14,7 +14,7 @@ ## 0 1 yes no on off true false ## Color values are: ## white grey darkgrey black red green blue yellow brown cyan purple -## lightred lightgreen lighblue lighcyan lighpurple +## lightred lightgreen lightblue lightcyan lightpurple [main] @@ -96,6 +96,15 @@ ## # negative = red +## Color for highlighting information for easier reading. +## Unlike positive/negative color, this is intended for neutral information, +## like highlighting table column by which the rows are sorted. +## +## Valid values: color +## Default value: lightcyan +## +# highlight = lightcyan + ## Color for user dialog options. ## ## Valid values: color -- 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] <zypper> master : Ignore the length of terminal control sequences.
by Ján Kupec 25 Apr '09

25 Apr '09

ref: refs/heads/master commit 534fdf0ecb97690c9419798c426b9fbd069dd268 Author: Ján Kupec <jkupec(a)suse.cz> Date: Sat Apr 25 20:56:39 2009 +0200 Ignore the length of terminal control sequences. This makes correct wrapping of colored text and colored table texts possbile. --- src/utils/text.cc | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/utils/text.cc b/src/utils/text.cc index cc01d59..784fa19 100644 --- a/src/utils/text.cc +++ b/src/utils/text.cc @@ -28,6 +28,7 @@ int string_to_columns_e (const string & str) const char* ptr = str.c_str (); size_t s_bytes = str.length (); int s_cols = 0; + bool in_ctrlseq = false; mbstate_t shift_state; memset (&shift_state, 0, sizeof (shift_state)); @@ -41,7 +42,13 @@ int string_to_columns_e (const string & str) if (c_bytes >= (size_t) -2) // incomplete (-2) or invalid (-1) sequence return -1; - s_cols += wcwidth (wc); + // ignore the length of terminal control sequences in order + if (!in_ctrlseq && ::wcsncmp(&wc, L"\033", 1) == 0) + in_ctrlseq = true; + else if (in_ctrlseq && ::wcsncmp(&wc, L"m", 1) == 0) + in_ctrlseq = false; + else if (!in_ctrlseq) + s_cols += ::wcwidth(wc); s_bytes -= c_bytes; ptr += c_bytes; @@ -64,19 +71,19 @@ void wrap_text(ostream & out, const string & text, unsigned indent, unsigned wrap_width, int initial) { const char * s = text.c_str(); - size_t s_bytes = text.length (); + size_t s_bytes = text.length(); const char * prevwp = s; const char * linep = s; wchar_t wc; size_t bytes_read; bool in_word = false; + bool in_ctrlseq = false; mbstate_t shift_state; memset (&shift_state, 0, sizeof (shift_state)); unsigned col = 0; unsigned toindent = initial < 0 ? indent : initial; - //wchar_t ws[2] = L" "; do { // indentation @@ -89,7 +96,14 @@ void wrap_text(ostream & out, const string & text, bytes_read = mbrtowc (&wc, s, s_bytes, &shift_state); if (bytes_read > 0) { - col += ::wcwidth(wc); + // ignore the length of terminal control sequences in order + // to wrap colored text correctly + if (!in_ctrlseq && ::wcsncmp(&wc, L"\033", 1) == 0) + in_ctrlseq = true; + else if (in_ctrlseq && ::wcsncmp(&wc, L"m", 1) == 0) + in_ctrlseq = false; + else if (!in_ctrlseq) + col += ::wcwidth(wc); if (::iswspace(wc)) in_word = false; -- 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] <zypper> master : Grrr.. 'no for yes'
by Ján Kupec 23 Apr '09

23 Apr '09

ref: refs/heads/master commit f7f7c0dd85cf8d05f86a3d15cc20ea3de32a9e85 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 23 09:56:26 2009 +0200 Grrr.. 'no for yes' --- src/utils/prompt.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/prompt.cc b/src/utils/prompt.cc index cbab44b..1fef1e4 100644 --- a/src/utils/prompt.cc +++ b/src/utils/prompt.cc @@ -337,9 +337,9 @@ unsigned int get_prompt_reply(Zypper & zypper, if (poptions.isYesNoPrompt()) { s << " " << format( - // translators: the %s are: 'y', 'n', 'yes' (translated), and 'no' (translated). + // translators: the %s are: 'y', 'yes' (translated), 'n', and 'no' (translated). _("Enter '%s' for '%s' or '%s' for '%s' if nothing else works for you.")) - % "y" % "n" % _("yes") % _("no"); + % "y" % _("yes") % "n" % _("no"); } zypper.out().prompt(pid, s.str(), poptions); -- 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 : Provide IdType typedef
by Michael Andres 20 Apr '09

20 Apr '09

ref: refs/heads/master commit 7fa7a5e333b348ea67cfefd153aed861169a3071 Author: Michael Andres <ma(a)suse.de> Date: Mon Apr 20 16:35:39 2009 +0200 Provide IdType typedef --- zypp/IdStringType.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/zypp/IdStringType.h b/zypp/IdStringType.h index dbe2cc7..54e5f62 100644 --- a/zypp/IdStringType.h +++ b/zypp/IdStringType.h @@ -87,6 +87,8 @@ namespace zypp private base::SafeBool<Derived> { typedef typename base::SafeBool<Derived>::bool_type bool_type; + public: + typedef IdString::IdType IdType; protected: IdStringType() {} @@ -105,7 +107,7 @@ namespace zypp const char * c_str() const { return idStr().c_str(); } std::string asString() const { return idStr().asString(); } - IdString::IdType id() const { return idStr().id(); } + IdType id() const { return idStr().id(); } public: #ifndef SWIG // Swig treats it as syntax error -- 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> ma-tmp-pqt : Add Match Flags and excetion.
by Michael Andres 17 Apr '09

17 Apr '09

ref: refs/heads/ma-tmp-pqt commit 984e3b1f22be251384dbeec1ec89e4736cb7cfd0 Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 17 18:27:39 2009 +0200 Add Match Flags and excetion. --- devel/devel.ma/Test.cc | 26 +++++++++- zypp/PoolQuery.cc | 34 ++++++++---- zypp/PoolQuery.h | 10 ++++ zypp/sat/AttrMatcher.cc | 51 ++++++++++++++++++ zypp/sat/AttrMatcher.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++- zypp/sat/LookupAttr.h | 4 +- 6 files changed, 241 insertions(+), 16 deletions(-) diff --git a/devel/devel.ma/Test.cc b/devel/devel.ma/Test.cc index 646fb69..5255ee4 100644 --- a/devel/devel.ma/Test.cc +++ b/devel/devel.ma/Test.cc @@ -3,6 +3,7 @@ #include <zypp/sat/LookupAttr.h> #include <zypp/PoolQuery.h> +#include <zypp/sat/AttrMatcher.h> static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch @@ -16,13 +17,36 @@ int main( int argc, char * argv[] ) INT << "===[START]==========================================" << endl; test.loadRepo( "/Local/ROOT/cache/solv/@System/solv" ); + Match t( Match::REGEX ); + + MIL << (t|Match::STRING) << endl; + MIL << (t|Match::NOCASE) << endl; + MIL << (Match::STRING|t) << endl; + MIL << (Match::STRING|Match::NOCASE) << endl; + + + Match m = Match::STRING | Match::NOCASE | Match::GLOB ; + m = Match::NOCASE | Match::STRING; + MIL << m << endl; + MIL << m-Match::NOCASE << endl; + + MIL << Match(8765) << endl; + MIL << Match() << endl; + + + INT << "===[END]============================================" << endl << endl; + return 0; + + + PoolQuery q; q.addString("foo*|k?"); q.setMatchRegex(); for_( it, q.nbegin(), q.nend() ) { - ; + zypp::PoolItem pi( zypp::ResPool::instance().find( *it ) ); + MIL << pi.resolvable() << endl; } INT << "===[END]============================================" << endl << endl; diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index dc3f126..15941da 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -40,8 +40,6 @@ using namespace zypp::sat; namespace zypp { ///////////////////////////////////////////////////////////////// -#warning CHECK FOR MEMLEAK DUE TO MISSING dataiterator_free - /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolQuery::Impl @@ -61,9 +59,10 @@ namespace zypp {} public: +#if USE_OLD_ITERATOR const_iterator begin() const; const_iterator end() const; - +#endif string asString() const; void compile() const; @@ -407,7 +406,7 @@ attremptycheckend: return rstr; } - +#if USE_OLD_ITERATOR PoolQuery::const_iterator PoolQuery::Impl::begin() const { compile(); @@ -463,7 +462,7 @@ attremptycheckend: { return PoolQuery::const_iterator(); } - +#endif string PoolQuery::Impl::asString() const { @@ -913,16 +912,26 @@ attremptycheckend: { return _pimpl->_status_flags; } PoolQuery::const_iterator PoolQuery::begin() const - { return _pimpl->begin(); } - + { +#if USE_OLD_ITERATOR + return _pimpl->begin(); +#else + return nbegin(); +#endif + } PoolQuery::const_iterator PoolQuery::end() const - { return _pimpl->end(); } - + { +#if USE_OLD_ITERATOR + return _pimpl->end(); +#else + return nend(); +#endif + } bool PoolQuery::empty() const { - try { return _pimpl->begin() == _pimpl->end(); } + try { return begin() == end(); } catch (const Exception & ex) {} return true; } @@ -933,7 +942,8 @@ attremptycheckend: size_type count = 0; try { - for(const_iterator it = _pimpl->begin(); it != _pimpl->end(); ++it, ++count); + for_( it, begin(), end() ) + ++count; } catch (const Exception & ex) {} @@ -942,7 +952,7 @@ attremptycheckend: void PoolQuery::execute(ProcessResolvable fnc) - { invokeOnEach(_pimpl->begin(), _pimpl->end(), fnc); } + { invokeOnEach( begin(), end(), fnc); } /////////////////////////////////////////////////////////////////// diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index 93ac803..d86b8af 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -34,6 +34,8 @@ namespace zypp class NewPoolQueryIterator; } +#define USE_OLD_ITERATOR 0 + /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolQuery @@ -80,7 +82,11 @@ namespace zypp * \see tests/zypp/PoolQuery_test.cc for more examples * \see sat::SolvIterMixin */ +#if USE_OLD_ITERATOR class PoolQuery : public sat::SolvIterMixin<PoolQuery, detail::PoolQueryIterator> +#else + class PoolQuery : public sat::SolvIterMixin<PoolQuery, detail::NewPoolQueryIterator> +#endif { public: typedef std::set<std::string> StrContainer; @@ -89,7 +95,11 @@ namespace zypp typedef std::map<sat::SolvAttr, std::string> AttrCompiledStrMap; typedef std::map<sat::SolvAttr, str::regex> AttrRegexMap; +#if USE_OLD_ITERATOR typedef detail::PoolQueryIterator const_iterator; +#else + typedef detail::NewPoolQueryIterator const_iterator; +#endif typedef unsigned int size_type; public: diff --git a/zypp/sat/AttrMatcher.cc b/zypp/sat/AttrMatcher.cc index 8aca558..f35ae08 100644 --- a/zypp/sat/AttrMatcher.cc +++ b/zypp/sat/AttrMatcher.cc @@ -16,6 +16,7 @@ extern "C" #include <iostream> #include "zypp/base/LogTools.h" +#include "zypp/base/String.h" #include "zypp/sat/AttrMatcher.h" @@ -24,6 +25,56 @@ using std::endl; /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : Match + // + /////////////////////////////////////////////////////////////////// + + const int Match::_modemask = SEARCH_STRINGMASK; + + const Match Match::NOHTING ( 0 ); + + const Match Match::STRING (SEARCH_STRING); + const Match Match::SUBSTRING (SEARCH_SUBSTRING); + const Match Match::GLOB (SEARCH_GLOB); + const Match Match::REGEX (SEARCH_REGEX); + + const Match Match::NOCASE (SEARCH_NOCASE); + const Match Match::NO_STORAGE_SOLVABLE(SEARCH_NO_STORAGE_SOLVABLE); + const Match Match::SUB (SEARCH_SUB); + const Match Match::ARRAYSENTINEL (SEARCH_ARRAYSENTINEL); + const Match Match::SKIP_KIND (SEARCH_SKIP_KIND); + const Match Match::FILES (SEARCH_FILES); + + std::ostream & operator<<( std::ostream & str, const Match & obj ) + { + if ( ! obj ) + return str << "NOHTING"; + + int val = obj.get(); + const char * sep = 0; +#define OUTS(V) if ( val & Match::V.get() ) { val &= ~Match::V.get(); if ( sep ) str << sep; else sep = "|"; str << #V; } + OUTS( STRING ); + OUTS( SUBSTRING ); + OUTS( GLOB ); + OUTS( REGEX ); + OUTS( NOCASE ); + OUTS( NO_STORAGE_SOLVABLE ); + OUTS( SUB ); + OUTS( ARRAYSENTINEL ); + OUTS( SKIP_KIND ); + OUTS( FILES ); +#undef OUTS + if ( val ) + { + if ( sep ) str << sep; + str << zypp::str::hexstring( val ); + } + return str; + } + /////////////////////////////////////////////////////////////////// namespace sat { ///////////////////////////////////////////////////////////////// diff --git a/zypp/sat/AttrMatcher.h b/zypp/sat/AttrMatcher.h index 4e324fd..38607cb 100644 --- a/zypp/sat/AttrMatcher.h +++ b/zypp/sat/AttrMatcher.h @@ -26,6 +26,127 @@ struct _Datamatcher; /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : Match + // + /** String matching option flags as used e.g. by \ref sat::AttrMatcher. + * \code + * Match mode( Match::GLOB | Match::NOCASE ); + * \endcode + */ + struct Match : private base::SafeBool<Match> + { + /** \name Mode flags (mutual exclusive) */ + //@{ + static const Match STRING; + static const Match SUBSTRING; + static const Match GLOB; + static const Match REGEX; + //@} + /** \name Option flags + * Some flags are actually \ref sat::LookupAttr specific, as they tell + * how to retrieve the attribute values. The plain \ref sat::AttrMatcher + * will ignore those flags and use the ones related to string matching only + * (like \ref NOCASE). + */ + //@{ + static const Match NOCASE; + static const Match NO_STORAGE_SOLVABLE; + static const Match SUB; + static const Match ARRAYSENTINEL; + static const Match SKIP_KIND; + static const Match FILES; + //@} + + public: + /** \c 0 */ + static const Match NOHTING; + + /** Default ctor \c 0 or \ref NOHTING. */ + Match() + : _val( 0 ) + {} + + /** Just in case one needs it. */ + explicit Match( int val_r ) + : _val( val_r ) + {} + +#ifndef SWIG // Swig treats it as syntax error + /** Evaluate in a boolean context <tt>( != 0 )</tt>. */ + using base::SafeBool<Match>::operator bool_type; +#endif + + public: + /** Add flags (switching the mode, if mode is set in \c rhs). */ + Match & operator|=( const Match & rhs ) + { + if ( rhs._val & _modemask ) + _val = rhs._val | ( _val & ~_modemask ); + else + _val |= rhs._val; + return *this; + } + + /** Remove option flags (Not changing the mode part).*/ + Match & operator-=( const Match & rhs ) + { + _val &= _modemask | ~rhs._val; + return *this; + } + + public: + /** Whether at least one of the \a rhs bits is set. */ + bool anyOf( const Match & rhs ) const + { return _val & rhs._val; } + + /** Whether all of the \a rhs bits are set. */ + bool allOf( const Match & rhs ) const + { return (_val & rhs._val) == rhs._val; } + + /** Return the \c mode part. */ + Match mode() const + { return Match( _val & _modemask ); } + + /** Return the \c flags part. */ + Match flags() const + { return Match( _val & ~_modemask ); } + + /** Return the integer representation. */ + int get() const + { return _val; } + + private: + friend base::SafeBool<Match>::operator bool_type() const; + bool boolTest() const + { return _val; } + + private: + int _val; + static const int _modemask; + }; + + /** \relates Match */ + inline bool operator==( const Match & lhs, const Match & rhs ) + { return lhs.get() == rhs.get(); } + /** \relates Match */ + inline bool operator!=( const Match & lhs, const Match & rhs ) + { return lhs.get() != rhs.get(); } + + /** \relates Match */ + inline Match operator|( const Match & lhs, const Match & rhs ) + { return Match(lhs) |= rhs; } + /** \relates Match */ + inline Match operator-( const Match & lhs, const Match & rhs ) + { return Match(lhs) -= rhs; } + + /** \relates Match Stream output */ + std::ostream & operator<<( std::ostream & str, const Match & obj ); + + /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// namespace sat { ///////////////////////////////////////////////////////////////// @@ -105,9 +226,16 @@ namespace zypp /** Set new search flags. */ void setFlags( int flags_r ); - private: - /** Return whether string matches. + public: + /** Compile the pattern e.g. in case of \c REGEX. + * \throws MatchInvalidRegexException If \ref Match::REGEX is set + * and \ref searchstring is not a valid regular expression. */ + void compile() const; + / + bool isCompiled() const; + private: + /** Return whether string matches. */ bool doMatch( const char * string_r ) const; private: diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index eff1ce2..ea5f7ce 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -162,7 +162,9 @@ namespace zypp */ const AttrMatcher & attrMatcher() const; - /** Set the pattern to match. */ + /** Set the pattern to match. + * \throws MatchException Any of the exceptions thrown by \ref AttrMatcher::compile. + */ void setAttrMatcher( const AttrMatcher & matcher_r ); /** Reset the pattern to match. */ -- 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> ma-tmp-pqt : prepare rx eceptions
by Michael Andres 17 Apr '09

17 Apr '09

ref: refs/heads/ma-tmp-pqt commit c1ba47bd673e4aedb22180605709230094c7389c Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 17 11:03:40 2009 +0200 prepare rx eceptions --- zypp/sat/AttrMatcher.cc | 1 - zypp/sat/AttrMatcher.h | 5 ++++- zypp/sat/LookupAttr.cc | 9 +++++++++ zypp/sat/LookupAttr.h | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/zypp/sat/AttrMatcher.cc b/zypp/sat/AttrMatcher.cc index e85e1d2..8aca558 100644 --- a/zypp/sat/AttrMatcher.cc +++ b/zypp/sat/AttrMatcher.cc @@ -88,7 +88,6 @@ namespace zypp { if ( _matcher ) ::datamatcher_free( _matcher.get() ); - //_search[0] = 0; _matcher.reset(); } diff --git a/zypp/sat/AttrMatcher.h b/zypp/sat/AttrMatcher.h index 17c9ab9..4e324fd 100644 --- a/zypp/sat/AttrMatcher.h +++ b/zypp/sat/AttrMatcher.h @@ -50,6 +50,8 @@ namespace zypp * * \todo Enhance the search flags manip interface; Enums and * Flags are missing; int flags should not be needed. + * + * \todo Add regex Excetion to doMatch. */ class AttrMatcher : private base::SafeBool<AttrMatcher> { @@ -104,7 +106,8 @@ namespace zypp void setFlags( int flags_r ); private: - /** Return whether string matches. */ + /** Return whether string matches. + */ bool doMatch( const char * string_r ) const; private: diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 8b850ac..f66ed96 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -268,6 +268,15 @@ namespace zypp _mstring.empty() ? 0 : _mstring.c_str(), flags_r ); } + DIWrap::DIWrap( RepoIdType repoId_r, SolvableIdType solvId_r, IdType attrId_r, + const char * mstring_r, int flags_r ) + : _dip( new ::Dataiterator ) + , _mstring( mstring_r ? mstring_r : "" ) + { + ::dataiterator_init( _dip, sat::Pool::instance().get(), repoId_r, solvId_r, attrId_r, + _mstring.empty() ? 0 : _mstring.c_str(), flags_r ); + } + DIWrap::DIWrap( const DIWrap & rhs ) : _dip( 0 ) , _mstring( rhs._mstring ) diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index 9886609..eff1ce2 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -268,6 +268,9 @@ namespace zypp /** Initializes */ DIWrap( RepoIdType repoId_r, SolvableIdType solvId_r, IdType attrId_r, const std::string & mstring_r = std::string(), int flags_r = 0 ); + /** \overload to catch \c NULL \a mstring_r. */ + DIWrap( RepoIdType repoId_r, SolvableIdType solvId_r, IdType attrId_r, + const char * mstring_r, int flags_r = 0 ); DIWrap( const DIWrap & rhs ); ~DIWrap(); public: -- 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> ma-tmp-pqt : use DIWrap
by Michael Andres 17 Apr '09

17 Apr '09

ref: refs/heads/ma-tmp-pqt commit 05fae1cc433b527b7d4bcf2e7d6f8c6d24afc741 Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 17 10:17:59 2009 +0200 use DIWrap --- devel/devel.ma/NewPool.cc | 9 +++- zypp/PoolQuery.cc | 34 ++++------------ zypp/PoolQuery.h | 2 +- zypp/sat/LookupAttr.cc | 98 +++++++++++++++++++------------------------- zypp/sat/LookupAttr.h | 22 ++++------ 5 files changed, 66 insertions(+), 99 deletions(-) diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index 0bc829c..0b68a79 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -463,6 +463,7 @@ bool querycompare( const PoolQuery & q ) for_( it, q.nbegin(), q.nend() ) { ++nc; +// DBG << it << endl; } MIL << nc << endl; } @@ -470,6 +471,10 @@ bool querycompare( const PoolQuery & q ) { Measure x( "old query" ); oc = q.size(); +/* for_( it, q.begin(), q.end() ) + { + DBG << *it << endl; + }*/ MIL << oc << endl; } @@ -608,14 +613,14 @@ try { /////////////////////////////////////////////////////////////////// std::string search("devel"); - //search = ""; PoolQuery q; //querycompare( q ); q.addString(search); + //q.addAttribute(sat::SolvAttr::name, "augeas" ); q.addAttribute(sat::SolvAttr::name, "foo" ); - //q.addAttribute(sat::SolvAttr::summary); + q.addAttribute(sat::SolvAttr::summary); q.setMatchSubstring(); //q.setMatchExact(); q.setCaseSensitive( true ); diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index c33ce96..dc3f126 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -432,46 +432,28 @@ attremptycheckend: //DBG << "_cflags:" << _cflags << endl; - scoped_ptr< ::_Dataiterator> _rdit( new ::Dataiterator ); + sat::detail::DIWrap dip; // initialize the Dataiterator for different cases if (_rcattrs.empty()) { - ::dataiterator_init(_rdit.get(), - pool.get(), - repo.get(), // either NULL or the repo to search - 0, // search all solvables - 0, // attribute id - only if 1 attr key specified - _rcstrings.empty() ? 0 : _rcstrings.c_str(), // compiled search string - _cflags); + sat::detail::DIWrap( repo.get(), 0, 0, _rcstrings, _cflags ).swap( dip ); } else if (_rcattrs.size() == 1) { - ::dataiterator_init(_rdit.get(), - pool.get(), - repo.get(), // either NULL or the repo to search - 0, // search all solvables - _rcattrs.begin()->first.id(), // keyname - attribute id - only if 1 attr key specified - _rcstrings.empty() ? 0 : _rcstrings.c_str(), // compiled search string - _cflags); + sat::detail::DIWrap( repo.get(), 0, _rcattrs.begin()->first.id(), _rcstrings, _cflags ).swap( dip ); } else { - ::dataiterator_init(_rdit.get(), - pool.get(), - repo.get(), // either NULL or the repo to search - 0, /*search all resolvables */ - 0, /*keyname - if only 1 attr key specified, pass it here, otherwise do more magic */ - 0, //qs.empty() ? 0 : qs.c_str(), /* create regex, pass it here */ - _cflags); + sat::detail::DIWrap( repo.get(), 0, 0, "", _cflags ).swap( dip ); } - if ((_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX && _rdit->matcher.error != 0) + if ((_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX && dip->matcher.error != 0) ZYPP_THROW(Exception(str::form( _("Invalid regular expression '%s': regcomp returned %d"), - _rcstrings.c_str(), _rdit->matcher.error))); + _rcstrings.c_str(), dip->matcher.error))); - PoolQuery::const_iterator it(_rdit, this); + PoolQuery::const_iterator it(dip, this); it.increment(); return it; } @@ -560,7 +542,7 @@ attremptycheckend: PoolQueryIterator::PoolQueryIterator( - scoped_ptr< ::_Dataiterator> & dip_r, + sat::detail::DIWrap & dip_r, const PoolQuery::Impl * pqimpl) : _sid(0) , _has_next(true) diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index 6eb82d2..93ac803 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -477,7 +477,7 @@ namespace zypp friend class PoolQuery::Impl; PoolQueryIterator( - scoped_ptr< ::_Dataiterator> & dip_r, + sat::detail::DIWrap & dip_r, const PoolQuery::Impl * pqimpl); const sat::Solvable dereference() const diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index aa2a710..8b850ac 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -110,35 +110,16 @@ namespace zypp LookupAttr::iterator begin() const { - if ( _attr == SolvAttr::noAttr ) + if ( _attr == SolvAttr::noAttr || sat::Pool::instance().reposEmpty() ) return end(); -#warning Need to call dataiterator_free, use Autodispose instead of scoped_ptr - scoped_ptr< ::_Dataiterator> dip( new ::Dataiterator ); - - const char * m = 0; - int f = 0; - if ( _attrMatcher ) - { - m = _attrMatcher.searchstring().c_str(); - f = _attrMatcher.flags(); - } - + detail::RepoIdType whichRepo = detail::noRepoId; // all repos if ( _solv ) - { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _solv.repository().id(), _solv.id(), _attr.id(), m, f ); - } + whichRepo = _solv.repository().id(); else if ( _repo ) - { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _repo.id(), _solv.id(), _attr.id(), m, f ); - } - else if ( ! sat::Pool::instance().reposEmpty() ) - { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), 0, _solv.id(), _attr.id(), m, f ); - } - else - return end(); + whichRepo = _repo.id(); + detail::DIWrap dip( whichRepo, _solv.id(), _attr.id(), _attrMatcher.searchstring(), _attrMatcher.flags() ); return iterator( dip ); // iterator takes over ownership! } @@ -278,6 +259,15 @@ namespace zypp namespace detail { + DIWrap::DIWrap( RepoIdType repoId_r, SolvableIdType solvId_r, IdType attrId_r, + const std::string & mstring_r, int flags_r ) + : _dip( new ::Dataiterator ) + , _mstring( mstring_r ) + { + ::dataiterator_init( _dip, sat::Pool::instance().get(), repoId_r, solvId_r, attrId_r, + _mstring.empty() ? 0 : _mstring.c_str(), flags_r ); + } + DIWrap::DIWrap( const DIWrap & rhs ) : _dip( 0 ) , _mstring( rhs._mstring ) @@ -293,7 +283,17 @@ namespace zypp ::datamatcher_init( &matcher, _mstring.c_str(), matcher.flags ); } else if ( matcher.match && matcher.match != _mstring.c_str() ) + { + //SEC << "**" << rhs._dip << endl; + SEC << "r " << rhs._dip->matcher.match << endl; + SEC << "r " << rhs._dip->matcher.flags << endl; + SEC << "r " << (const void*)rhs._mstring.c_str() << "'" << rhs._mstring << "'" << endl; + + SEC << "t " << matcher.match << endl; + SEC << "t " << matcher.flags << endl; + SEC << "t " << (const void*)_mstring.c_str() << "'" << _mstring << "'" << endl; throw( "this cant be!" ); + } } } @@ -427,11 +427,8 @@ namespace zypp // remember this position ::dataiterator_setpos( _dip.get() ); - // setup the new sub iterator - scoped_ptr< ::_Dataiterator> dip( new ::Dataiterator ); - - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), 0, SOLVID_POS, 0, 0, 0 ); - + // setup the new sub iterator with the remembered position + detail::DIWrap dip( 0, SOLVID_POS, 0, 0, 0 ); return iterator( dip ); // iterator takes over ownership! } @@ -606,48 +603,40 @@ namespace zypp // internal stuff below /////////////////////////////////////////////////////////////////// - LookupAttr::iterator::~iterator() - { - - } - LookupAttr::iterator::iterator() : iterator_adaptor_( 0 ) {} LookupAttr::iterator::iterator( const iterator & rhs ) - : iterator_adaptor_( cloneFrom( rhs.base() ) ) - , _dip( base() ) + : iterator_adaptor_( 0 ) + , _dip( rhs._dip ) + { + base_reference() = _dip.get(); + } + + LookupAttr::iterator::iterator( detail::DIWrap & dip_r ) + : iterator_adaptor_( 0 ) + { + _dip.swap( dip_r ); // take ownership! + base_reference() = _dip.get(); + increment(); + } + + LookupAttr::iterator::~iterator() {} LookupAttr::iterator & LookupAttr::iterator::operator=( const iterator & rhs ) { if ( &rhs != this ) { - _dip.reset( cloneFrom( rhs.base() ) ); + _dip = rhs._dip; base_reference() = _dip.get(); } return *this; } - LookupAttr::iterator::iterator( scoped_ptr< ::_Dataiterator> & dip_r ) - : iterator_adaptor_( dip_r.get() ) - { - _dip.swap( dip_r ); // take ownership! - increment(); - } - /////////////////////////////////////////////////////////////////// - ::_Dataiterator * LookupAttr::iterator::cloneFrom( const ::_Dataiterator * rhs ) - { - if ( ! rhs ) - return 0; - ::_Dataiterator * ret( new ::_Dataiterator ); - *ret = *rhs; - return ret; - } - bool LookupAttr::iterator::dip_equal( const ::_Dataiterator & lhs, const ::_Dataiterator & rhs ) const { // Iterator equal is same position in same container. @@ -665,9 +654,6 @@ namespace zypp { if ( _dip && ! ::dataiterator_step( _dip.get() ) ) { -#warning MEMLEAK - DATAITERATOR FREE NEEDS TO BE EXTENDED - DTOR ASSIGN - if ( 0 && _dip ) - ::dataiterator_free( _dip.get() ); _dip.reset(); base_reference() = 0; } diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index f7def2d..9886609 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -251,7 +251,7 @@ namespace zypp namespace detail { - /** Wrapper around sat dataiterator. + /** Wrapper around sat \c ::_Dataiterator. * * Manages copy and assign, and release of allocated * resources like datamatcher inside the dataiterator. @@ -261,17 +261,13 @@ namespace zypp class DIWrap : private base::SafeBool<DIWrap> { public: + /** \c NULL \c ::_Dataiterator */ DIWrap() : _dip( 0 ) {} - /** Ctor takes over ownership of \b allocated dataiterator. */ - explicit DIWrap( ::_Dataiterator * allocated_r ) - : _dip( allocated_r ) - {} - /** Ctor takes over ownership of \b allocated dataiterator. */ - DIWrap( ::_Dataiterator * allocated_r, const std::string & mstring_r ) - : _dip( allocated_r ), _mstring( mstring_r ) - {} + /** Initializes */ + DIWrap( RepoIdType repoId_r, SolvableIdType solvId_r, IdType attrId_r, + const std::string & mstring_r = std::string(), int flags_r = 0 ); DIWrap( const DIWrap & rhs ); ~DIWrap(); public: @@ -490,16 +486,14 @@ namespace zypp public: /** - * C-tor taking over ownership of the passed scoped _Dataiterator* + * C-tor taking over ownership of the passed \c ::_Dataiterator * and doing it's first iteration (::dataiterator_step) */ - iterator( scoped_ptr< ::_Dataiterator> & dip_r ); + iterator( detail::DIWrap & dip_r ); private: friend class boost::iterator_core_access; - ::_Dataiterator * cloneFrom( const ::_Dataiterator * rhs ); - template <class OtherDerived, class OtherIterator, class V, class C, class R, class D> bool equal( const boost::iterator_adaptor<OtherDerived, OtherIterator, V, C, R, D> & rhs ) const { @@ -518,7 +512,7 @@ namespace zypp ::_Dataiterator * get() const { return _dip.get(); } private: - scoped_ptr< ::_Dataiterator> _dip; + detail::DIWrap _dip; }; /////////////////////////////////////////////////////////////////// -- 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 typo
by Michael Schroeder 16 Apr '09

16 Apr '09

ref: refs/heads/master commit b1ac5914c79b84d39b1c5020b892f14a6160d1e0 Author: Michael Schroeder <mls(a)suse.de> Date: Thu Apr 16 19:25:57 2009 +0200 - fix typo --- src/solverdebug.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/solverdebug.c b/src/solverdebug.c index c63a280..1b74e1e 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -278,10 +278,10 @@ solver_printdecisions(Solver *solv) s = pool->solvables + solv->transaction.elements[i + 1]; switch(solv->transaction.elements[i]) { - case SOLVER_TRANSACTION_MULTI_INSTALL: + case SOLVER_TRANSACTION_MULTIINSTALL: POOL_DEBUG(SAT_DEBUG_RESULT, " multi install %s", solvable2str(pool, s)); break; - case SOLVER_TRANSACTION_MULTI_REINSTALL: + case SOLVER_TRANSACTION_MULTIREINSTALL: POOL_DEBUG(SAT_DEBUG_RESULT, " multi reinstall %s", solvable2str(pool, s)); break; case SOLVER_TRANSACTION_INSTALL: -- 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 : - create transaction as solver result
by Michael Schroeder 16 Apr '09

16 Apr '09

ref: refs/heads/master commit 0ebbbd41c5075a5e6ef305f44d5fdb7ada94a5a0 Author: Michael Schroeder <mls(a)suse.de> Date: Thu Apr 16 18:59:46 2009 +0200 - create transaction as solver result --- src/repodata.c | 2 +- src/solver.c | 245 ++++++++++++++++++++++++++++++++++++++++++ src/solver.h | 24 ++++ src/solverdebug.c | 107 ++++++++++--------- tests/solver/deptestomatic.c | 156 +++++++++------------------ tools/repo_rpmmd.c | 4 +- 6 files changed, 380 insertions(+), 158 deletions(-) diff --git a/src/repodata.c b/src/repodata.c index 1e54ff6..fc7798c 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1265,7 +1265,7 @@ dataiterator_step(Dataiterator *di) continue; } if (!datamatcher_match(&di->matcher, di->kv.str)) - continue; + continue; } /* found something! */ return 1; diff --git a/src/solver.c b/src/solver.c index a2e82f4..2d64b66 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2603,6 +2603,8 @@ solver_create(Pool *pool) solv->pool = pool; solv->installed = pool->installed; + queue_init(&solv->transaction); + queue_init(&solv->transaction_info); queue_init(&solv->ruletojob); queue_init(&solv->decisionq); queue_init(&solv->decisionq_why); @@ -2639,6 +2641,8 @@ solver_create(Pool *pool) void solver_free(Solver *solv) { + queue_free(&solv->transaction); + queue_free(&solv->transaction_info); queue_free(&solv->job); queue_free(&solv->ruletojob); queue_free(&solv->decisionq); @@ -4588,6 +4592,241 @@ findrecommendedsuggested(Solver *solv) map_free(&obsmap); } + +Solver *obsq_sortcmp_data; + +static int +obsq_sortcmp(const void *ap, const void *bp) +{ + Id a, b, oa, ob; + Solver *solv = obsq_sortcmp_data; + Pool *pool = solv->pool; + Solvable *s, *oas, *obs; + int r; + + a = ((Id *)ap)[0]; + oa = ((Id *)ap)[1]; + b = ((Id *)bp)[0]; + ob = ((Id *)bp)[1]; + if (a != b) + return a - b; + if (oa == ob) + return 0; + s = pool->solvables + a; + oas = pool->solvables + oa; + obs = pool->solvables + ob; + if (oas->name != obs->name) + { + if (oas->name == s->name) + return -1; + if (obs->name == s->name) + return 1; + return strcmp(id2str(pool, oas->name), id2str(pool, obs->name)); + } + r = evrcmp(pool, oas->evr, obs->evr, EVRCMP_COMPARE); + if (r) + return -r; /* highest version first */ + return oa - ob; +} + +void +solver_transaction_info(Solver *solv, Id p, Queue *out) +{ + Pool *pool = solv->pool; + Solvable *s = pool->solvables + p; + Queue *ti = &solv->transaction_info; + int i; + + queue_empty(out); + if (p <= 0 || !s->repo) + return; + if (s->repo == solv->installed) + { + /* find which packages obsolete us */ + for (i = 0; i < ti->count; i += 2) + if (ti->elements[i + 1] == p) + { + queue_push(out, p); + queue_push(out, ti->elements[i]); + } + if (out->count > 2) + { + /* sort obsoleters */ + obsq_sortcmp_data = solv; + qsort(out->elements, out->count / 2, 2 * sizeof(Id), obsq_sortcmp); + } + for (i = 0; i < out->count; i += 2) + out->elements[i] = out->elements[i / 2 + 1]; + out->count /= 2; + } + else + { + /* find the packages we obsolete */ + for (i = 0; i < ti->count; i += 2) + { + if (ti->elements[i] == p) + queue_push(out, ti->elements[i + 1]); + else if (out->count) + break; + } + } +} + +Id +solver_transaction_pkg(Solver *solv, Id p) +{ + Queue ti; + Id tibuf[5]; + + queue_init_buffer(&ti, tibuf, sizeof(tibuf)/sizeof(*tibuf)); + solver_transaction_info(solv, p, &ti); + p = ti.count ? ti.elements[0] : 0; + queue_free(&ti); + return p; +} + +static void +create_transaction(Solver *solv) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + Queue *ti = &solv->transaction_info; + int i, j, r, noobs; + Id p, p2, pp2; + Solvable *s, *s2; + + queue_empty(&solv->transaction); + queue_empty(ti); + + /* first create obsoletes index */ + if (installed) + { + for (i = 0; i < solv->decisionq.count; i++) + { + p = solv->decisionq.elements[i]; + if (p <= 0 || p == SYSTEMSOLVABLE) + continue; + s = pool->solvables + p; + if (s->repo == installed) + continue; + noobs = solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p); + FOR_PROVIDES(p2, pp2, s->name) + { + if (solv->decisionmap[p2] > 0) + continue; + s2 = pool->solvables + p2; + if (s2->repo != installed) + continue; + if (noobs && (s->name != s2->name || s->evr != s2->evr || s->arch != s2->arch)) + continue; + if (!solv->implicitobsoleteusesprovides && s->name != s2->name) + continue; + queue_push(ti, p); + queue_push(ti, p2); + } + if (s->obsoletes && !noobs) + { + Id obs, *obsp = s->repo->idarraydata + s->obsoletes; + while ((obs = *obsp++) != 0) + { + FOR_PROVIDES(p2, pp2, obs) + { + s2 = pool->solvables + p2; + if (s2->repo != installed) + continue; + if (!solv->obsoleteusesprovides && !pool_match_nevr(pool, pool->solvables + p2, obs)) + continue; + queue_push(ti, p); + queue_push(ti, p2); + } + } + } + } + obsq_sortcmp_data = solv; + qsort(ti->elements, ti->count / 2, 2 * sizeof(Id), obsq_sortcmp); + /* now unify */ + for (i = j = 0; i < ti->count; i += 2) + { + if (j && ti->elements[i] == ti->elements[j - 2] && ti->elements[i + 1] == ti->elements[j - 1]) + continue; + ti->elements[j++] = ti->elements[i]; + ti->elements[j++] = ti->elements[i + 1]; + } + ti->count = j; + } + + if (installed) + { + FOR_REPO_SOLVABLES(installed, p, s) + { + if (solv->decisionmap[p] > 0) + continue; + p2 = solver_transaction_pkg(solv, p); + if (!p2) + queue_push(&solv->transaction, SOLVER_TRANSACTION_ERASE); + else + { + s2 = pool->solvables + p2; + if (s->name == s2->name) + { + if (s->evr == s2->evr && solvable_identical(s, s2)) + queue_push(&solv->transaction, SOLVER_TRANSACTION_REINSTALLED); + else + { + r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); + if (r < 0) + queue_push(&solv->transaction, SOLVER_TRANSACTION_UPGRADED); + else if (r > 0) + queue_push(&solv->transaction, SOLVER_TRANSACTION_DOWNGRADED); + else + queue_push(&solv->transaction, SOLVER_TRANSACTION_CHANGED); + } + } + else + queue_push(&solv->transaction, SOLVER_TRANSACTION_OBSOLETED); + } + queue_push(&solv->transaction, p); + } + } + for (i = 0; i < solv->decisionq.count; i++) + { + p = solv->decisionq.elements[i]; + if (p < 0 || p == SYSTEMSOLVABLE) + continue; + s = pool->solvables + p; + if (solv->installed && s->repo == solv->installed) + continue; + noobs = solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p); + p2 = solver_transaction_pkg(solv, p); + if (noobs) + queue_push(&solv->transaction, p2 ? SOLVER_TRANSACTION_MULTIREINSTALL : SOLVER_TRANSACTION_MULTIINSTALL); + else if (!p2) + queue_push(&solv->transaction, SOLVER_TRANSACTION_INSTALL); + else + { + s2 = pool->solvables + p2; + if (s->name == s2->name) + { + if (s->evr == s2->evr && solvable_identical(s, s2)) + queue_push(&solv->transaction, SOLVER_TRANSACTION_REINSTALL); + else + { + r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE); + if (r > 0) + queue_push(&solv->transaction, SOLVER_TRANSACTION_UPGRADE); + else if (r < 0) + queue_push(&solv->transaction, SOLVER_TRANSACTION_DOWNGRADE); + else + queue_push(&solv->transaction, SOLVER_TRANSACTION_CHANGE); + } + } + else + queue_push(&solv->transaction, SOLVER_TRANSACTION_RENAME); + } + queue_push(&solv->transaction, p); + } +} + /* * * solve job queue @@ -5097,6 +5336,12 @@ solver_solve(Solver *solv, Queue *job) } solv->problems.count = j; } + + /* + * finally prepare transaction info + */ + create_transaction(solv); + POOL_DEBUG(SAT_DEBUG_STATS, "final solver statistics: %d problems, %d learned rules, %d unsolvable\n", solv->problems.count / 2, solv->stats_learned, solv->stats_unsolvable); POOL_DEBUG(SAT_DEBUG_STATS, "solver_solve took %d ms\n", sat_timems(solve_start)); } diff --git a/src/solver.h b/src/solver.h index 2731306..c271591 100644 --- a/src/solver.h +++ b/src/solver.h @@ -63,6 +63,9 @@ typedef struct solver { Pool *pool; Queue job; /* copy of the job we're solving */ + Queue transaction; /* solver result */ + Queue transaction_info; /* transaction obsoletes info */ + Repo *installed; /* copy of pool->installed */ /* list of rules, ordered @@ -325,9 +328,30 @@ typedef enum { #define SOLVER_SOLUTION_DISTUPGRADE (-1) #define SOLVER_SOLUTION_INFARCH (-2) +#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_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_RENAME 0x25 + +#define SOLVER_TRANSACTION_MULTIINSTALL 0x30 +#define SOLVER_TRANSACTION_MULTIREINSTALL 0x31 + + extern Solver *solver_create(Pool *pool); extern void solver_free(Solver *solv); extern void solver_solve(Solver *solv, Queue *job); +extern void solver_transaction_info(Solver *solv, Id p, Queue *info); +extern Id solver_transaction_pkg(Solver *solv, Id p); + extern int solver_dep_installed(Solver *solv, Id dep); extern int solver_splitprovides(Solver *solv, Id dep); diff --git a/src/solverdebug.c b/src/solverdebug.c index 3da35d8..c63a280 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -253,9 +253,10 @@ solver_printdecisions(Solver *solv) { Pool *pool = solv->pool; Repo *installed = solv->installed; - Id p, *obsoletesmap = solver_create_decisions_obsoletesmap(solv); - int i; + Id p; + int i, j; Solvable *s; + Queue iq; IF_POOLDEBUG (SAT_DEBUG_SCHUBI) { @@ -271,64 +272,68 @@ solver_printdecisions(Solver *solv) POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); POOL_DEBUG(SAT_DEBUG_RESULT, "transaction:\n"); - /* print solvables to be erased */ - - if (installed) - { - FOR_REPO_SOLVABLES(installed, p, s) - { - if (solv->decisionmap[p] > 0) - continue; - if (obsoletesmap[p]) - continue; - POOL_DEBUG(SAT_DEBUG_RESULT, " erase %s\n", solvable2str(pool, s)); - } - } - - /* print solvables to be installed */ - - for (i = 0; i < solv->decisionq.count; i++) + queue_init(&iq); + for (i = 0; i < solv->transaction.count; i += 2) { - int j; - p = solv->decisionq.elements[i]; - if (p < 0) - continue; - if (p == SYSTEMSOLVABLE) - continue; - s = pool->solvables + p; - if (installed && s->repo == installed) - continue; - - if (!obsoletesmap[p]) + s = pool->solvables + solv->transaction.elements[i + 1]; + switch(solv->transaction.elements[i]) { + case SOLVER_TRANSACTION_MULTI_INSTALL: + POOL_DEBUG(SAT_DEBUG_RESULT, " multi install %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_MULTI_REINSTALL: + POOL_DEBUG(SAT_DEBUG_RESULT, " multi reinstall %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_INSTALL: POOL_DEBUG(SAT_DEBUG_RESULT, " install %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_REINSTALL: + POOL_DEBUG(SAT_DEBUG_RESULT, " reinstall %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_DOWNGRADE: + POOL_DEBUG(SAT_DEBUG_RESULT, " downgrade %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_CHANGE: + POOL_DEBUG(SAT_DEBUG_RESULT, " change %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_UPGRADE: + case SOLVER_TRANSACTION_RENAME: + POOL_DEBUG(SAT_DEBUG_RESULT, " upgrade %s", solvable2str(pool, s)); + break; + case SOLVER_TRANSACTION_ERASE: + POOL_DEBUG(SAT_DEBUG_RESULT, " erase %s", solvable2str(pool, s)); + break; + default: + break; } - else - { - Id xp, xpp; - FOR_PROVIDES(xp, xpp, s->name) + switch(solv->transaction.elements[i]) + { + case SOLVER_TRANSACTION_INSTALL: + case SOLVER_TRANSACTION_ERASE: + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + break; + case SOLVER_TRANSACTION_REINSTALL: + case SOLVER_TRANSACTION_DOWNGRADE: + case SOLVER_TRANSACTION_CHANGE: + case SOLVER_TRANSACTION_UPGRADE: + case SOLVER_TRANSACTION_RENAME: + solver_transaction_info(solv, solv->transaction.elements[i + 1], &iq); + if (iq.count) { - Solvable *s2 = pool->solvables + xp; - if (s2->name != s->name) - continue; - if (evrcmp(pool, s->evr, s2->evr, EVRCMP_MATCH_RELEASE) < 0) - break; + POOL_DEBUG(SAT_DEBUG_RESULT, " (obsoletes"); + for (j = 0; j < iq.count; j++) + POOL_DEBUG(SAT_DEBUG_RESULT, " %s", solvable2str(pool, pool->solvables + iq.elements[j])); + POOL_DEBUG(SAT_DEBUG_RESULT, ")"); } - if (xp) - POOL_DEBUG(SAT_DEBUG_RESULT, " downgrade %s", solvable2str(pool, s)); - else - POOL_DEBUG(SAT_DEBUG_RESULT, " upgrade %s", solvable2str(pool, s)); - POOL_DEBUG(SAT_DEBUG_RESULT, " (obsoletes"); - for (j = installed->start; j < installed->end; j++) - if (obsoletesmap[j] == p) - POOL_DEBUG(SAT_DEBUG_RESULT, " %s", solvable2str(pool, pool->solvables + j)); - POOL_DEBUG(SAT_DEBUG_RESULT, ")"); + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + break; + default: + break; } - POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); } - POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); + queue_free(&iq); - sat_free(obsoletesmap); + POOL_DEBUG(SAT_DEBUG_RESULT, "\n"); if (solv->recommendations.count) { diff --git a/tests/solver/deptestomatic.c b/tests/solver/deptestomatic.c index 2cf7b85..945bf50 100644 --- a/tests/solver/deptestomatic.c +++ b/tests/solver/deptestomatic.c @@ -51,30 +51,31 @@ static Pool *decision_data; /*-----------------------------------------------------------------*/ -/* - * sorting queue by name - */ - static int -decision_sortcmp(const void *ap, const void *bp) +transaction_sortcmp(const void *ap, const void *bp) { Pool *pool = decision_data; int r; - Id a = *(Id *)ap; - Id b = *(Id *)bp; - if (a<0) a = -a; - if (b<0) b = -b; - if (a == SYSTEMSOLVABLE - || b == SYSTEMSOLVABLE) - return 0; - r = pool->solvables[a].name - pool->solvables[b].name; + Id a = ((Id *)ap)[1]; + Id b = ((Id *)bp)[1]; + Solvable *sa = pool->solvables + a; + Solvable *sb = pool->solvables + b; + + if (sa->repo != sb->repo && pool->installed) + { + if (sa->repo == pool->installed) + return -1; + if (sb->repo == pool->installed) + return 1; + } + r = sa->name - sb->name; if (r) { const char *na, *nb; /* different names. We use real strcmp here so that the result * is not depending on some random solvable order */ - na = id2str(pool, pool->solvables[a].name); - nb = id2str(pool, pool->solvables[b].name); + na = id2str(pool, sa->name); + nb = id2str(pool, sb->name); /* bring patterns to the front */ if (!strncmp(na, "pattern:", 8)) { @@ -1603,8 +1604,6 @@ static void rc_printdecisions(Solver *solv, Queue *job) { Pool *pool = solv->pool; - Repo *installed = solv->installed; - Id p, *obsoletesmap; int i; Solvable *s; @@ -1620,110 +1619,59 @@ rc_printdecisions(Solver *solv, Queue *job) } } - obsoletesmap = solver_create_decisions_obsoletesmap(solv); printf(">!> Solution #1:\n"); int installs = 0, uninstalls = 0, upgrades = 0; - /* print solvables to be erased */ + decision_data = solv->pool; + qsort(solv->transaction.elements, solv->transaction.count / 2, 2 * sizeof(Id), transaction_sortcmp); - if (installed) + for (i = 0; i < solv->transaction.count; i += 2) { - for (i = installed->start; i < installed->end; i++) + s = pool->solvables + solv->transaction.elements[i + 1]; + switch(solv->transaction.elements[i]) { - s = pool->solvables + i; - if (s->repo != installed) - continue; - if (solv->decisionmap[i] >= 0) - continue; - if (obsoletesmap[i]) - continue; + case SOLVER_TRANSACTION_INSTALL: + case SOLVER_TRANSACTION_MULTIINSTALL: + case SOLVER_TRANSACTION_RENAME: + printf(">!> install %s-%s%s", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); + if (!redcarpet) + printf(".%s", id2str(pool, s->arch)); + if (s->repo && strcmp(repo_name(s->repo), "locales")) + printf("[%s]", repo_name(s->repo)); + printf("\n"); + installs++; + break; + case SOLVER_TRANSACTION_ERASE: + case SOLVER_TRANSACTION_OBSOLETED: if (redcarpet) printf(">!> remove %s-%s%s\n", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); else printf(">!> remove %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); uninstalls++; - } - } - - /* print solvables to be installed */ - - /* sorting */ - decision_data = solv->pool; - qsort(solv->decisionq.elements, solv->decisionq.count, sizeof(Id), decision_sortcmp); - - for (i = 0; i < solv->decisionq.count; i++) - { - int j; - p = solv->decisionq.elements[i]; - if (p < 0) - { - if (solv->decisionq_why.elements[i] == 0 && solv->decisionmap[-p] == -1) - { - s = pool->solvables - p; - printf(">!> !unflag %s-%s.%s[%s]\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch), repo_name(s->repo)); - } - continue; - } - if (p == SYSTEMSOLVABLE) - continue; - s = pool->solvables + p; - if (installed && s->repo == installed) - continue; - - if (!obsoletesmap[p]) - { - printf(">!> "); - printf("install %s-%s%s", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); - if (!redcarpet) - printf(".%s", id2str(pool, s->arch)); - installs++; - } - else - { - Solvable *f, *fn = 0; - for (j = installed->start; j < installed->end; j++) - { - if (obsoletesmap[j] != p) - continue; - f = pool->solvables + j; - if (fn || f->name != s->name) - { - if (redcarpet) - printf(">!> remove %s-%s%s\n", id2str(pool, f->name), id2rc(solv, f->evr), id2str(pool, f->evr)); - else - printf(">!> remove %s-%s.%s\n", id2str(pool, f->name), id2str(pool, f->evr), id2str(pool, f->arch)); - uninstalls++; - } - else - fn = f; - } - if (!fn) - { - printf(">!> install %s-%s%s", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); - if (!redcarpet) - printf(".%s", id2str(pool, s->arch)); - installs++; - } + break; + case SOLVER_TRANSACTION_REINSTALLED: + case SOLVER_TRANSACTION_DOWNGRADED: + case SOLVER_TRANSACTION_CHANGED: + case SOLVER_TRANSACTION_UPGRADED: + if (redcarpet) + printf(">!> upgrade %s-%s => ", id2str(pool, s->name), id2str(pool, s->evr)); else - { - if (redcarpet) - printf(">!> upgrade %s-%s => %s-%s%s", id2str(pool, fn->name), id2str(pool, fn->evr), id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); - else - printf(">!> upgrade %s-%s.%s => %s-%s.%s", id2str(pool, fn->name), id2str(pool, fn->evr), id2str(pool, fn->arch), id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); - upgrades++; - } + printf(">!> upgrade %s-%s.%s => ", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + s = pool->solvables + solver_transaction_pkg(solv, solv->transaction.elements[i + 1]); + if (redcarpet) + printf("%s-%s%s", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr)); + else + printf("%s-%s.%s", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); + if (s->repo && strcmp(repo_name(s->repo), "locales")) + printf("[%s]", repo_name(s->repo)); + printf("\n"); + upgrades++; + break; } - Repo *repo = s->repo; - if (repo && strcmp(repo_name(repo), "locales")) - printf("[%s]", repo_name(repo)); - printf("\n"); } - printf(">!> installs=%d, upgrades=%d, uninstalls=%d\n", installs, upgrades, uninstalls); - - free(obsoletesmap); } /*-------------------------------------------------------------------*/ diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c index c72aba5..027c723 100644 --- a/tools/repo_rpmmd.c +++ b/tools/repo_rpmmd.c @@ -586,18 +586,18 @@ set_sourcerpm(Repodata *data, Solvable *s, Id handle, char *sourcerpm) return; sevr = p + 1; pool = s->repo->pool; - name = id2str(pool, s->name); - evr = id2str(pool, s->evr); if (!strcmp(sarch, "src.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_SRC); else if (!strcmp(sarch, "nosrc.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_NOSRC); else repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, strn2id(pool, sarch, strlen(sarch) - 4, 1)); + evr = id2str(pool, s->evr); if (evr && !strncmp(sevr, evr, sarch - sevr - 1) && evr[sarch - sevr - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCEEVR); else repodata_set_id(data, handle, SOLVABLE_SOURCEEVR, strn2id(pool, sevr, sarch - sevr - 1, 1)); + name = id2str(pool, s->name); if (name && !strncmp(sourcerpm, name, sevr - sourcerpm - 1) && name[sevr - sourcerpm - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCENAME); 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] <libzypp> ma-tmp-pqt : Provide IdType typedef.
by Michael Andres 16 Apr '09

16 Apr '09

ref: refs/heads/ma-tmp-pqt commit d0fa1d805ba80c7af543e18f8623ccece6686075 Author: Michael Andres <ma(a)suse.de> Date: Thu Apr 16 16:45:30 2009 +0200 Provide IdType typedef. --- zypp/IdStringType.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/zypp/IdStringType.h b/zypp/IdStringType.h index dbe2cc7..54e5f62 100644 --- a/zypp/IdStringType.h +++ b/zypp/IdStringType.h @@ -87,6 +87,8 @@ namespace zypp private base::SafeBool<Derived> { typedef typename base::SafeBool<Derived>::bool_type bool_type; + public: + typedef IdString::IdType IdType; protected: IdStringType() {} @@ -105,7 +107,7 @@ namespace zypp const char * c_str() const { return idStr().c_str(); } std::string asString() const { return idStr().asString(); } - IdString::IdType id() const { return idStr().id(); } + IdType id() const { return idStr().id(); } public: #ifndef SWIG // Swig treats it as syntax error -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0