December 2007 - Zypp Commits - openSUSE Mailing Lists

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

27 Dec '07

Author: matz Date: Thu Dec 27 21:25:17 2007 New Revision: 8149 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8149&view=rev Log: Some infrastructure for directory trees. Modified: trunk/sat-solver/src/attr_store.c trunk/sat-solver/src/attr_store.h trunk/sat-solver/src/attr_store_p.h Modified: trunk/sat-solver/src/attr_store.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.c?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.c (original) +++ trunk/sat-solver/src/attr_store.c Thu Dec 27 21:25:17 2007 @@ -69,6 +69,157 @@ return s->ss.stringspace + s->ss.strings[id]; } +static void +setup_dirs (Attrstore *s) +{ + static const char *ss_init_strs[] = + { + "<NULL>", + "", + 0 + }; + + s->dirtree.dirs = calloc (1024, sizeof (s->dirtree.dirs[0])); + s->dirtree.ndirs = 2; + s->dirtree.dirs[0].child = 0; + s->dirtree.dirs[0].sibling = 0; + s->dirtree.dirs[0].name = 0; + s->dirtree.dirs[1].child = 0; + s->dirtree.dirs[1].sibling = 0; + s->dirtree.dirs[1].name = STRID_EMPTY; + + s->dirtree.dirstack_size = 16; + s->dirtree.dirstack = malloc (s->dirtree.dirstack_size * sizeof (s->dirtree.dirstack[0])); + s->dirtree.ndirstack = 0; + s->dirtree.dirstack[s->dirtree.ndirstack++] = 1; //dir-id of / + + stringpool_init (&s->dirtree.ss, ss_init_strs); +} + +static unsigned +dir_lookup_1 (Attrstore *s, unsigned dir, const char *name, unsigned insert) +{ + Id nameid; + while (*name == '/') + name++; + if (!*name) + return dir; + const char *end = strchrnul (name, '/'); + nameid = stringpool_strn2id (&s->dirtree.ss, name, end - name, 1); + unsigned c, num = 0; + Dir *dirs = s->dirtree.dirs; + for (c = dirs[dir].child; c; c = dirs[c].sibling, num++) + if (nameid == dirs[c].name) + break; + if (!c && !insert) + return 0; + if (!c) + { + c = s->dirtree.ndirs++; + if (!(c & 1023)) + dirs = realloc (dirs, (c + 1024) * sizeof (dirs[0])); + dirs[c].child = 0; + dirs[c].sibling = dirs[dir].child; + dirs[c].name = nameid; + dirs[c].parent = dir; + dirs[dir].child = c; + s->dirtree.dirs = dirs; + } + if (!(s->dirtree.ndirstack & 15)) + { + s->dirtree.dirstack_size += 16; + s->dirtree.dirstack = realloc (s->dirtree.dirstack, s->dirtree.dirstack_size * sizeof (s->dirtree.dirstack[0])); + } + s->dirtree.dirstack[s->dirtree.ndirstack++] = c; + if (!*end) + return c; + unsigned ret = dir_lookup_1 (s, c, end + 1, insert); + return ret; +} + +unsigned +dir_lookup (Attrstore *s, const char *name, unsigned insert) +{ + if (!s->dirtree.ndirs) + setup_dirs (s); + + /* Detect number of common path components. Accept multiple // . */ + const char *new_start; + unsigned components; + for (components = 1, new_start = name; components < s->dirtree.ndirstack; ) + { + int ofs; + const char *dirname; + while (*new_start == '/') + new_start++; + dirname = stringpool_id2str (&s->dirtree.ss, s->dirtree.dirs[s->dirtree.dirstack[components]].name); + for (ofs = 0;; ofs++) + { + char n = new_start[ofs]; + char d = dirname[ofs]; + if (d == 0 && (n == 0 || n == '/')) + { + new_start += ofs; + components++; + if (n == 0) + goto endmatch2; + break; + } + if (n != d) + goto endmatch; + } + } +endmatch: + while (*new_start == '/') + new_start++; +endmatch2: + + /* We have always / on the stack. */ + //assert (ndirstack); + //assert (ndirstack >= components); + s->dirtree.ndirstack = components; + unsigned ret = s->dirtree.dirstack[s->dirtree.ndirstack - 1]; + if (*new_start) + ret = dir_lookup_1 (s, ret, new_start, insert); + //assert (ret == dirstack[ndirstack - 1]); + return ret; +} + +unsigned +dir_parent (Attrstore *s, unsigned dir) +{ + return s->dirtree.dirs[dir].parent; +} + +void +dir2str (Attrstore *s, unsigned dir, char **str, unsigned *len) +{ + unsigned l = 0; + Id ids[s->dirtree.dirstack_size + 1]; + unsigned i, ii; + for (i = 0; dir > 1; dir = dir_parent (s, dir), i++) + ids[i] = s->dirtree.dirs[dir].name; + ii = i; + l = 1; + for (i = 0; i < ii; i++) + l += 1 + strlen (stringpool_id2str (&s->dirtree.ss, ids[i])); + l++; + if (l > *len) + { + *str = malloc (l); + *len = l; + } + char *dest = *str; + *dest++ = '/'; + for (i = ii; i--;) + { + const char *name = stringpool_id2str (&s->dirtree.ss, ids[i]); + dest = mempcpy (dest, name, strlen (name)); + *dest++ = '/'; + } + *dest = 0; +} + void ensure_entry (Attrstore *s, unsigned int entry) { @@ -1086,7 +1237,8 @@ s->ent2attr[i] += start, start = s->ent2attr[i]; } - if (fwrite (s->flat_attrs + 1, s->attr_next_free - 1, 1, fp) != 1) + if (s->entries + && fwrite (s->flat_attrs + 1, s->attr_next_free - 1, 1, fp) != 1) { perror ("write error"); exit (1); @@ -1379,7 +1531,7 @@ unsigned char ignore_char = 1; if (fread(&ignore_char, 1, 1, fp) != 1 - || fread(strsp, local_ssize, 1, fp) != 1 + || (local_ssize && fread(strsp, local_ssize, 1, fp) != 1) || ignore_char != 0) { perror ("read error while reading strings"); @@ -1442,7 +1594,7 @@ s->attr_next_free = start; s->flat_attrs = xmalloc (((s->attr_next_free + FLAT_ATTR_BLOCK) & ~FLAT_ATTR_BLOCK) * sizeof (s->flat_attrs[0])); s->flat_attrs[0] = 0; - if (fread (s->flat_attrs + 1, s->attr_next_free - 1, 1, fp) != 1) + if (s->entries && fread (s->flat_attrs + 1, s->attr_next_free - 1, 1, fp) != 1) { perror ("read error"); exit (1); Modified: trunk/sat-solver/src/attr_store.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store.h?rev=… ============================================================================== --- trunk/sat-solver/src/attr_store.h (original) +++ trunk/sat-solver/src/attr_store.h Thu Dec 27 21:25:17 2007 @@ -41,6 +41,10 @@ void add_attr_void (Attrstore *s, unsigned int entry, Id name); void merge_attrs (Attrstore *s, unsigned dest, unsigned src); +unsigned dir_lookup (Attrstore *s, const char *name, unsigned insert); +unsigned dir_parent (Attrstore *s, unsigned dir); +void dir2str (Attrstore *s, unsigned dir, char **str, unsigned *len); + const void * attr_retrieve_blob (Attrstore *s, unsigned int ofs, unsigned int len); #define SEARCH_SUBSTRING 1 Modified: trunk/sat-solver/src/attr_store_p.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/attr_store_p.h?re… ============================================================================== --- trunk/sat-solver/src/attr_store_p.h (original) +++ trunk/sat-solver/src/attr_store_p.h Thu Dec 27 21:25:17 2007 @@ -39,6 +39,14 @@ long file_size; } Attrblobpage; +typedef struct _Dir +{ + unsigned parent; + unsigned child; + unsigned sibling; + Id name; +} Dir; + struct _Attrstore { Pool *pool; @@ -57,6 +65,14 @@ Stringpool ss; + struct Dirtree { + Dir *dirs; + unsigned ndirs; + Stringpool ss; + unsigned *dirstack; + unsigned ndirstack, dirstack_size; + } dirtree; + /* A space efficient in memory representation. It's read-only. */ /* flat_attrs[ent2attr[i]] are the attrs for entity i. */ unsigned int *ent2attr; -- 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] r8148 - in /trunk/sat-solver/src: hash.h strpool.c strpool.h
by matz＠svn.opensuse.org 27 Dec '07

27 Dec '07

Author: matz Date: Thu Dec 27 18:32:46 2007 New Revision: 8148 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8148&view=rev Log: I'll have a need for inserting substrings into a stringpool. Modified: trunk/sat-solver/src/hash.h trunk/sat-solver/src/strpool.c trunk/sat-solver/src/strpool.h Modified: trunk/sat-solver/src/hash.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/hash.h?rev=8148&r… ============================================================================== --- trunk/sat-solver/src/hash.h (original) +++ trunk/sat-solver/src/hash.h Thu Dec 27 18:32:46 2007 @@ -41,6 +41,16 @@ return r; } +static inline Hashval +strnhash(const char *str, unsigned len) +{ + Hashval r = 0; + unsigned int c; + while (len-- && (c = *(const unsigned char *)str++) != 0) + r += (r << 3) + c; + return r; +} + /* hash for rel * rel -> hash */ Modified: trunk/sat-solver/src/strpool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.c?rev=814… ============================================================================== --- trunk/sat-solver/src/strpool.c (original) +++ trunk/sat-solver/src/strpool.c Thu Dec 27 18:32:46 2007 @@ -37,7 +37,7 @@ } Id -stringpool_str2id (Stringpool *ss, const char *str, int create) +stringpool_strn2id (Stringpool *ss, const char *str, unsigned len, int create) { Hashval h; unsigned int hh; @@ -79,12 +79,13 @@ // compute hash and check for match - h = strhash(str) & hashmask; + h = strnhash(str, len) & hashmask; hh = HASHCHAIN_START; while ((id = hashtbl[h]) != 0) // follow hash overflow chain { // break if string already hashed - if(!strcmp(ss->stringspace + ss->strings[id], str)) + if(!memcmp(ss->stringspace + ss->strings[id], str, len) + && ss->stringspace[ss->strings[id] + len] == 0) break; h = HASHCHAIN_NEXT(h, hh, hashmask); } @@ -101,19 +102,29 @@ // 'pointer' into stringspace is Offset of next free pos: sstrings ss->strings[id] = ss->sstrings; - space_needed = strlen(str) + 1; + space_needed = len + 1; // resize string buffer if needed if (((ss->sstrings + space_needed - 1) | STRINGSPACE_BLOCK) != ((ss->sstrings - 1) | STRINGSPACE_BLOCK)) ss->stringspace = xrealloc(ss->stringspace, (ss->sstrings + space_needed + STRINGSPACE_BLOCK) & ~STRINGSPACE_BLOCK); // copy new string into buffer - memcpy(ss->stringspace + ss->sstrings, str, space_needed); + memcpy(ss->stringspace + ss->sstrings, str, space_needed - 1); + // add the sentinel, we can't rely on it being in the source string (in + // case the LEN is not really strlen(str)) + ss->stringspace[ss->sstrings + space_needed - 1] = 0; // next free pos is behind new string ss->sstrings += space_needed; return id; } +Id +stringpool_str2id (Stringpool *ss, const char *str, int create) +{ + unsigned len = strlen (str); + return stringpool_strn2id (ss, str, len, create); +} + void stringpool_shrink (Stringpool *ss) { Modified: trunk/sat-solver/src/strpool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.h?rev=814… ============================================================================== --- trunk/sat-solver/src/strpool.h (original) +++ trunk/sat-solver/src/strpool.h Thu Dec 27 18:32:46 2007 @@ -26,6 +26,13 @@ void stringpool_init (Stringpool *ss, const char *strs[]); Id stringpool_str2id (Stringpool *ss, const char *str, int create); +Id stringpool_strn2id (Stringpool *ss, const char *str, unsigned len, int create); void stringpool_shrink (Stringpool *ss); +static inline const char * +stringpool_id2str (Stringpool *ss, Id id) +{ + return ss->stringspace + ss->strings[id]; +} + #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] r8147 - in /trunk/sat-solver/bindings: ruby/tests/relation.rb ruby/tests/repo.rb ruby/tests/solver.rb satsolver.i
by kkaempf＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: kkaempf Date: Sat Dec 22 19:09:20 2007 New Revision: 8147 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8147&view=rev Log: more API cleanup limit 'each' iterators to Ruby (using rb_yield) index access to Solvables for Repo and Pool index access to Relations for Dependency Modified: trunk/sat-solver/bindings/ruby/tests/relation.rb trunk/sat-solver/bindings/ruby/tests/repo.rb trunk/sat-solver/bindings/ruby/tests/solver.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/relation.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/relation.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/relation.rb Sat Dec 22 19:09:20 2007 @@ -10,13 +10,16 @@ @repo = SatSolver::Repo.new( @pool, "test" ) assert @repo @pool.arch = "i686" - @repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + @repo = @pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) assert @repo.size > 0 end def test_relation rel = SatSolver::Relation.new( @pool, "A", SatSolver::REL_EQ, "1.0-0" ) puts "Relation: #{rel}" - @repo.each_solvable{ |s| + @repo.each { |s| + unless (s.provides.empty?) + puts s.provides[0] + end s.provides.each { |p| res1 = (p <=> rel) puts "#{p} cmp #{rel} => #{res1}" Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Sat Dec 22 19:09:20 2007 @@ -26,7 +26,7 @@ assert pool pool.arch = "i686" repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) - repo.each_solvable{ |s| + repo.each { |s| puts s } assert true Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Sat Dec 22 19:09:20 2007 @@ -19,6 +19,11 @@ solver = SatSolver::Solver.new( pool, system ) solver.allow_uninstall = 1 solver.solve( transaction ) - solver.print_decisions + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_erase { |s| + puts "Erase #{s}" + } end end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sat Dec 22 19:09:20 2007 @@ -49,6 +49,18 @@ return dependency; } +static int dependency_size( const Dependency *dep ) +{ + if (!dep) return 0; + int i = 0; + if (dep->relation) { + Id *ids = dep->solvable->repo->idarraydata + dep->relation; + while (*ids++) + ++i; + } + return i; +} + typedef struct _Action { SolverCmd cmd; Id id; @@ -209,12 +221,21 @@ int repo_count() { return $self->nrepos; } + Repo *get_repo( int i ) + { + if ( i < 0 ) return NULL; + if ( i >= $self->nrepos ) return NULL; + return $self->repos[i]; + } + +#if defined(SWIGRUBY) void each_repo() { int i; for (i = 0; i < $self->nrepos; ++i ) rb_yield(SWIG_NewPointerObj((void*) $self->repos[i], SWIGTYPE_p__Repo, 0)); } +#endif Repo *find_repo( const char *name ) { @@ -254,6 +275,7 @@ if (i >= $self->nsolvables) return NULL; return $self->solvables + i; } +#if defined(SWIGRUBY) void each() { Solvable *s; @@ -265,6 +287,7 @@ rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); } } +#endif Solvable * find( char *name, Repo *repo = NULL ) @@ -330,7 +353,8 @@ Pool *pool() { return $self->pool; } - void each_solvable() +#if defined(SWIGRUBY) + void each() { Solvable *s; Id p; @@ -341,6 +365,8 @@ rb_yield( SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0) ); } } +#endif + #if defined(SWIGRUBY) /* %rename is rejected by swig for [] */ %alias get_solvable "[]"; @@ -419,15 +445,35 @@ ~Dependency() { free( $self ); } int size() + { return dependency_size( $self ); } +#if defined(SWIGRUBY) + %rename("empty?") empty(); +#endif + int empty() + { return dependency_size( $self ) == 0; } + +#if defined(SWIGRUBY) + /* %rename is rejected by swig for [] */ + %alias get_relation "[]"; +#endif + Relation *get_relation( int i ) { - int i = 0; if ($self->relation) { + /* loop over it to detect end */ Id *ids = $self->solvable->repo->idarraydata + $self->relation; - while (*ids++) - ++i; + while ( i-- >= 0 ) { + if ( !*ids ) + break; + if ( i == 0 ) { + return relation_new( *ids, $self->solvable->repo->pool ); + } + ++ids; + } } - return i; + return NULL; } + +#if defined(SWIGRUBY) void each() { if ($self->relation) { @@ -438,6 +484,8 @@ } } } +#endif + #if defined(SWIGRUBY) /* %rename is rejected by swig for [] */ %alias get_relation "[]"; @@ -675,12 +723,12 @@ void print_decisions() { printdecisions( $self ); } -#if 0 void each_to_install() { Id p; Solvable *s; - for (int i = 0; i < $self->decisionq.count; i++) + int i; + for ( i = 0; i < $self->decisionq.count; i++) { p = $self->decisionq.elements[i]; if (p <= 0) @@ -697,7 +745,7 @@ } } - void each_to_remove() + void each_to_erase() { Id p; Solvable *s; @@ -712,7 +760,7 @@ rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); } } -#endif + }; #if 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] r8146 - /trunk/sat-solver/bindings/ruby/satsolver.rb
by dmacvicar＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: dmacvicar Date: Sat Dec 22 18:16:25 2007 New Revision: 8146 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8146&view=rev Log: readd Added: trunk/sat-solver/bindings/ruby/satsolver.rb Added: trunk/sat-solver/bindings/ruby/satsolver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/satsolv… ============================================================================== --- trunk/sat-solver/bindings/ruby/satsolver.rb (added) +++ trunk/sat-solver/bindings/ruby/satsolver.rb Sat Dec 22 18:16:25 2007 @@ -0,0 +1,13 @@ +require 'satsolverx' + +module Satsolverx +# class Solvable +# def to_s +# "#{id_2str(self.source.pool, name)}-#{id_2str(self.source.pool, vr)}-#{id_2str(self.source.pool, arch)}" +# end +# end +end + +module SatSolver + include Satsolverx +end \ No newline at end of file -- 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] r8145 - /trunk/sat-solver/examples/ruby/basic.rb
by dmacvicar＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: dmacvicar Date: Sat Dec 22 18:16:20 2007 New Revision: 8145 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8145&view=rev Log: fix example broken by module renames Modified: trunk/sat-solver/examples/ruby/basic.rb Modified: trunk/sat-solver/examples/ruby/basic.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/examples/ruby/basic.r… ============================================================================== --- trunk/sat-solver/examples/ruby/basic.rb (original) +++ trunk/sat-solver/examples/ruby/basic.rb Sat Dec 22 18:16:20 2007 @@ -1,6 +1,6 @@ require 'satsolver' -include Satsolver +include SatSolver pool = Pool.new #puts pool.methods.sort -- 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] r8144 - in /trunk/sat-solver/bindings/ruby: CMakeLists.txt tests/pool.rb tests/solvable.rb
by dmacvicar＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: dmacvicar Date: Sat Dec 22 18:16:14 2007 New Revision: 8144 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8144&view=rev Log: Follow conventions!!!! Ruby module names must be capitalized, but the convention for Ruby feature names is to use lowercase names. So, for example, the Etc extension module is imported by requiring the etc feature: # The feature name begins with a lowercase letter... require 'etc' # ... but the module name begins with an uppercase letter puts "Your login name: #{Etc.getlogin}" Also, having a pure ruby wrapper allows for extending the native module with pure ruby code. We want to AVOID C code. Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/bindings/ruby/tests/pool.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Sat Dec 22 18:16:14 2007 @@ -1,5 +1,7 @@ ADD_SUBDIRECTORY(tests) - + +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/tools") + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") @@ -22,15 +24,15 @@ DEPENDS ${SWIG_OUTPUT} ) -SET(SatSolver_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c") -ADD_LIBRARY( SatSolver SHARED ${SatSolver_SRCS}) -SET_TARGET_PROPERTIES( SatSolver PROPERTIES PREFIX "" ) -ADD_DEPENDENCIES( SatSolver glue ) - -INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) -TARGET_LINK_LIBRARIES( SatSolver satsolver ) -TARGET_LINK_LIBRARIES( SatSolver ${RUBY_LIBRARY} ) -TARGET_LINK_LIBRARIES( SatSolver ${DB43_LIBRARY} ) - -INSTALL(TARGETS SatSolver LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) -#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) \ No newline at end of file +SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) +ADD_LIBRARY( satsolverx SHARED "${satsolverx_SRCS}" ) +SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( satsolverx glue ) + +INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) +TARGET_LINK_LIBRARIES( satsolverx satsolver ) +TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) + +INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) +CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb COPYONLY ) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) Modified: trunk/sat-solver/bindings/ruby/tests/pool.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/pool.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/pool.rb Sat Dec 22 18:16:14 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Pool require 'test/unit' -require 'SatSolver' +require 'satsolver' class PoolTest < Test::Unit::TestCase def test_pool Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Sat Dec 22 18:16:14 2007 @@ -1,7 +1,7 @@ $: << "../../../build/bindings/ruby" # test Solvable require 'test/unit' -require 'SatSolver' +require 'satsolver' def show_dep name, deps return unless deps -- 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] r8143 - /trunk/sat-solver/bindings/satsolver.i
by dmacvicar＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: dmacvicar Date: Sat Dec 22 18:16:06 2007 New Revision: 8143 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8143&view=rev Log: - fix broken testcase looking for repo_count Modified: trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sat Dec 22 18:16:06 2007 @@ -1,4 +1,4 @@ -%module SatSolver +%module satsolverx %{ @@ -206,7 +206,7 @@ return repo; } - int size_repo() + int repo_count() { return $self->nrepos; } void each_repo() -- 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] r8142 - in /trunk/sat-solver/bindings: ruby/tests/repo.rb ruby/tests/solvable.rb ruby/tests/solver.rb ruby/tests/transaction.rb satsolver.i
by kkaempf＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: kkaempf Date: Sat Dec 22 18:12:45 2007 New Revision: 8142 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8142&view=rev Log: - move repo loading from Repo to Pool: add_solv, add_rpmdb - add Solver class can solve now but result access is still missing Added: trunk/sat-solver/bindings/ruby/tests/solver.rb Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/ruby/tests/transaction.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Sat Dec 22 18:12:45 2007 @@ -15,20 +15,17 @@ def test_repo_add pool = SatSolver::Pool.new assert pool - repo = SatSolver::Repo.new( pool, "test" ) - assert repo pool.arch = "i686" - puts repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) - puts repo.name - puts repo.size + repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo.name = "test" + assert repo.name == "test" + assert repo.size > 0 end def test_deps pool = SatSolver::Pool.new assert pool - repo = SatSolver::Repo.new( pool, "test" ) - assert repo pool.arch = "i686" - puts repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) repo.each_solvable{ |s| puts s } Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Sat Dec 22 18:12:45 2007 @@ -5,16 +5,16 @@ def show_dep name, deps return unless deps - puts "#{deps.size} #{name}: " + puts " #{deps.size} #{name}: " i = 0 while (i < deps.size) d = deps[i] - puts "#{d.name} : #{d}" + puts "\t#{d.name} : #{d}" i += 1 end -# does not work yet + deps.each { |d| - puts "#{d.name} #{d.op} #{d.evr}" + puts "\t#{d.name} #{d.op} #{d.evr}" } end @@ -22,14 +22,12 @@ def setup @pool = SatSolver::Pool.new assert @pool - @repo = SatSolver::Repo.new( @pool, "test" ) - assert @repo @pool.arch = "i686" - @repo.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) - assert @repo.size > 0 + @pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + assert @pool.size > 0 end def test_solvable - solv = @repo[0] + solv = @pool[2] assert solv puts solv puts "#{solv.id}: #{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" @@ -37,7 +35,7 @@ puts "#{solv.id}: #{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" end def test_deps - @repo.each_solvable{ |s| + @pool.each { |s| puts s show_dep "Provides", s.provides show_dep "Requires", s.requires Added: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Sat Dec 22 18:12:45 2007 @@ -0,0 +1,24 @@ +$: << "../../../build/bindings/ruby" +# test Solver +require 'test/unit' +require 'SatSolver' + +class SolverTest < Test::Unit::TestCase + def test_solver + pool = SatSolver::Pool.new + assert pool + pool.arch = "i686" + system = pool.add_rpmdb( "/" ) + repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo.name = "test" + + transaction = SatSolver::Transaction.new( pool ) + transaction.install( "A" ) + transaction.erase( "xorg-x11" ) + + solver = SatSolver::Solver.new( pool, system ) + solver.allow_uninstall = 1 + solver.solve( transaction ) + solver.print_decisions + end +end Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Sat Dec 22 18:12:45 2007 @@ -7,13 +7,21 @@ def test_transaction pool = SatSolver::Pool.new assert pool + pool.arch = "i686" + repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo.name = "test" + puts "repo[0] #{repo[0]}" + puts "repo[1] #{repo[1]}" + transaction = SatSolver::Transaction.new( pool ) assert transaction transaction.install( "foo" ) + transaction.install( repo[0] ) transaction.install( SatSolver::Relation.new( pool, "foo", SatSolver::REL_EQ, "42-7" ) ) transaction.erase( "bar" ) + transaction.erase( repo[1] ) transaction.erase( SatSolver::Relation.new( pool, "bar", SatSolver::REL_EQ, "42-7" ) ) - assert transaction.size == 4 + assert transaction.size == 6 transaction.each { |a| cmd = case a.cmd when SatSolver::INSTALL_SOLVABLE: "install" Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sat Dec 22 18:12:45 2007 @@ -125,6 +125,10 @@ %rename(Transaction) _Transaction; typedef struct _Transaction {} Transaction; +%nodefault solver; +%rename(Solver) solver; +typedef struct solver {} Solver; + /*-------------------------------------------------------------*/ /* Pool */ @@ -177,9 +181,27 @@ * Repo management */ + Repo *add_solv( FILE *fp ) + { + Repo *repo = repo_create( $self, NULL ); + repo_add_solv( repo, fp ); + return repo; + } + + Repo *add_solv( const char *fname ) + { + Repo *repo = repo_create( $self, NULL ); + FILE *fp = fopen( fname, "r"); + if (fp) { + repo_add_solv( repo, fp ); + fclose( fp ); + } + return repo; + } + Repo *add_rpmdb( const char *rootdir ) { - Repo *repo = repo_create( $self, "system" ); + Repo *repo = repo_create( $self, NULL ); repo_add_rpmdb( repo, NULL, rootdir ); return repo; } @@ -222,6 +244,16 @@ Solvable *id2solvable( Id p ) { return pool_id2solvable( $self, p ); } +#if defined(SWIGRUBY) + /* %rename is rejected by swig for [] */ + %alias get_solvable "[]"; +#endif + Solvable *get_solvable( int i ) + { + if (i < 0) return NULL; + if (i >= $self->nsolvables) return NULL; + return $self->solvables + i; + } void each() { Solvable *s; @@ -279,24 +311,22 @@ %extend Repo { Repo( Pool *pool, const char *reponame ) { return repo_create( pool, reponame ); } - int add_solv( FILE *fp ) - { return repo_add_solv( $self, fp ); } - int add_solv( const char *fname ) - { - int result = -1; - FILE *fp = fopen( fname, "r"); - if (fp) { - result = repo_add_solv( $self, fp ); - fclose( fp ); - } - return result; - } int size() { return $self->nsolvables; } const char *name() { return $self->name; } +#if defined(SWIGRUBY) + %rename( "name=" ) set_name( const char *name ); +#endif + void set_name( const char *name ) + { $self->name = name; } int priority() { return $self->priority; } +#if defined(SWIGRUBY) + %rename( "priority=" ) set_priority( int i ); +#endif + void set_priority( int i ) + { $self->priority = i; } Pool *pool() { return $self->pool; } @@ -587,24 +617,65 @@ } -#if 0 - -%include "solver.h" +/*-------------------------------------------------------------*/ +/* Solver */ %extend Solver { - - Solver( Pool *pool, Repo *installed ) { return solver_create(pool, installed); } - ~Solver() { solver_free($self); } - %rename("fix_system") fixsystem; - %rename("update_system") updatesystem; - %rename("allow_downgrade") allowdowngrade; - %rename("allow_uninstall") allowuninstall; - %rename("no_update_provide") noupdateprovide; + Solver( Pool *pool, Repo *installed ) + { return solver_create( pool, installed ); } + ~Solver() + { solver_free( $self ); } + + /* yeah, thats awkward. But %including solver.h and adding lots + of %ignores is even worse ... */ + + int fix_system() + { return $self->fixsystem; } +#if defined(SWIGRUBY) + %rename( "fix_system=" ) set_fix_system( int i ); +#endif + void set_fix_system( int i ) + { $self->fixsystem = i; } + + int update_system() + { return $self->updatesystem; } +#if defined(SWIGRUBY) + %rename( "update_system=" ) set_update_system( int i ); +#endif + void set_update_system( int i ) + { $self->updatesystem = i; } + + int allow_downgrade() + { return $self->allowdowngrade; } +#if defined(SWIGRUBY) + %rename( "allow_downgrade=" ) set_allow_downgrade( int i ); +#endif + void set_allow_downgrade( int i ) + { $self->allowdowngrade = i; } + + int allow_uninstall() + { return $self->allowuninstall; } +#if defined(SWIGRUBY) + %rename( "allow_uninstall=" ) set_allow_uninstall( int i ); +#endif + void set_allow_uninstall( int i ) + { $self->allowuninstall = i; } + + int no_update_provide() + { return $self->noupdateprovide; } +#if defined(SWIGRUBY) + %rename( "no_update_provide=" ) set_no_update_provide( int i ); +#endif + void set_no_update_provide( int i ) + { $self->noupdateprovide = i; } - void solve(Queue *job) { solver_solve($self, job); } - void print_decisions() { printdecisions($self); } + void solve( Transaction *t ) + { solver_solve( $self, &(t->queue)); } + void print_decisions() + { printdecisions( $self ); } +#if 0 void each_to_install() { Id p; @@ -641,8 +712,11 @@ rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); } } +#endif }; +#if 0 + %include "repo.h" %include "repo_solv.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] r8141 - in /trunk/sat-solver/bindings: ruby/tests/action.rb ruby/tests/transaction.rb satsolver.i
by kkaempf＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: kkaempf Date: Sat Dec 22 16:39:55 2007 New Revision: 8141 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8141&view=rev Log: final preparation before solving - define 'Action' as cmd,id combination (to be used internal) - define 'Transaction' as a queue of Actions for a Pool Actions are added to it via 'install' and 'erase' methods Added: trunk/sat-solver/bindings/ruby/tests/action.rb trunk/sat-solver/bindings/ruby/tests/transaction.rb Modified: trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/ruby/tests/action.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/a… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/action.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/action.rb Sat Dec 22 16:39:55 2007 @@ -0,0 +1,13 @@ +$: << "../../../build/bindings/ruby" +# test Action +require 'test/unit' +require 'SatSolver' + +class ActionTest < Test::Unit::TestCase + def test_action + action = SatSolver::Action.new( SatSolver::INSTALL_SOLVABLE, 1 ) + assert action + assert action.cmd == SatSolver::INSTALL_SOLVABLE + assert action.id == 1 + end +end Added: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Sat Dec 22 16:39:55 2007 @@ -0,0 +1,32 @@ +$: << "../../../build/bindings/ruby" +# test Transction +require 'test/unit' +require 'SatSolver' + +class TransactionTest < Test::Unit::TestCase + def test_transaction + pool = SatSolver::Pool.new + assert pool + transaction = SatSolver::Transaction.new( pool ) + assert transaction + transaction.install( "foo" ) + transaction.install( SatSolver::Relation.new( pool, "foo", SatSolver::REL_EQ, "42-7" ) ) + transaction.erase( "bar" ) + transaction.erase( SatSolver::Relation.new( pool, "bar", SatSolver::REL_EQ, "42-7" ) ) + assert transaction.size == 4 + transaction.each { |a| + cmd = case a.cmd + when SatSolver::INSTALL_SOLVABLE: "install" + when SatSolver::ERASE_SOLVABLE: "erase" + when SatSolver::INSTALL_SOLVABLE_NAME: "install name" + when SatSolver::ERASE_SOLVABLE_NAME: "erase name" + when SatSolver::INSTALL_SOLVABLE_PROVIDES: "install relation" + when SatSolver::ERASE_SOLVABLE_PROVIDES: "erase relation" + else "<NONE>" + end + puts "#{cmd}: #{pool.idname(a.id)}" + } + transaction.clear! + assert transaction.empty? + end +end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sat Dec 22 16:39:55 2007 @@ -24,6 +24,7 @@ Offset id; Pool *pool; } Relation; + static Relation *relation_new( Id id, Pool *pool ) { if (!id) return NULL; @@ -48,6 +49,38 @@ return dependency; } +typedef struct _Action { + SolverCmd cmd; + Id id; +} Action; + +static Action *action_new( SolverCmd cmd, Id id ) +{ + Action *action = (Action *)malloc( sizeof( Action )); + action->cmd = cmd; + action->id = id; + return action; +} + +typedef struct _Transaction { + Pool *pool; + Queue queue; +} Transaction; + +static Transaction *transaction_new( Pool *pool ) +{ + Transaction *t = (Transaction *)malloc( sizeof( Transaction )); + t->pool = pool; + queue_init( &(t->queue) ); + return t; +} + +static void transaction_free( Transaction *t ) +{ + queue_free( &(t->queue) ); + free( t ); +} + %} /*-------------------------------------------------------------*/ @@ -84,6 +117,14 @@ %rename(Dependency) _Dependency; typedef struct _Dependency {} Dependency; +%nodefault _Action; +%rename(Action) _Action; +typedef struct _Action {} Action; + +%nodefault _Transaction; +%rename(Transaction) _Transaction; +typedef struct _Transaction {} Transaction; + /*-------------------------------------------------------------*/ /* Pool */ @@ -121,6 +162,18 @@ { pool_createwhatprovides( $self ); } /* + * Name management + */ + Id intern( const char *name ) + { + return str2id( $self, name, 1 ); + } + const char *idname( Id id ) + { + return id2str( $self, id ); + } + + /* * Repo management */ @@ -166,7 +219,7 @@ /* without the %rename, swig converts it to 'id_2solvable'. Ouch! */ %rename( "id2solvable" ) id2solvable( Id p ); - Solvable *id2solvable(Id p) + Solvable *id2solvable( Id p ) { return pool_id2solvable( $self, p ); } void each() @@ -427,48 +480,114 @@ } /*-------------------------------------------------------------*/ +/* Action */ -#if 0 - -%include "poolid.h" -%include "pooltypes.h" - -%include "queue.h" - -%extend Queue { +%extend Action { + %constant int INSTALL_SOLVABLE = 1; + %constant int ERASE_SOLVABLE = 2; + %constant int INSTALL_SOLVABLE_NAME = 3; + %constant int ERASE_SOLVABLE_NAME = 4; + %constant int INSTALL_SOLVABLE_PROVIDES = 5; + %constant int ERASE_SOLVABLE_PROVIDES = 6; + + Action( int cmd, Id id ) + { return action_new( cmd, id ); } + ~Action() + { free( $self ); } + int cmd() + { return $self->cmd; } + Id id() + { return $self->id; } +} - Queue() - { Queue *q = new Queue(); queue_init(q); return q; } +/*-------------------------------------------------------------*/ +/* Transaction */ - ~Queue() - { queue_free($self); } +%extend Transaction { + Transaction( Pool *pool ) + { return transaction_new( pool ); } - Queue* clone() - { Queue *t = new Queue(); queue_clone(t, $self); return t; } + ~Transaction() + { transaction_free( $self ); } - Id shift() - { return queue_shift($self); } + Action *shift() + { + int cmd = queue_shift( &($self->queue) ); + Id id = queue_shift( &($self->queue) ); + return action_new( cmd, id ); + } - void push(Id id) - { /*printf("push id\n");*/ queue_push($self, id); } - - void push( Solvable *s ) - { /*printf("push solvable\n");*/ queue_push($self, (s - s->repo->pool->solvables)); } + void push( const Action *action ) + { + queue_push( &($self->queue), action->cmd ); + queue_push( &($self->queue), action->id ); + } - void push_unique(Id id) - { queue_pushunique($self, id); } + void install( Solvable *s ) + { + queue_push( &($self->queue), SOLVER_INSTALL_SOLVABLE ); + /* FIXME: check: s->repo->pool == $self->pool */ + queue_push( &($self->queue), (s - s->repo->pool->solvables) ); + } + void erase( Solvable *s ) + { + queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE ); + /* FIXME: check: s->repo->pool == $self->pool */ + queue_push( &($self->queue), (s - s->repo->pool->solvables) ); + } + void install( const char *name ) + { + queue_push( &($self->queue), SOLVER_INSTALL_SOLVABLE_NAME ); + queue_push( &($self->queue), str2id( $self->pool, name, 1 )); + } + void erase( const char *name ) + { + queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &($self->queue), str2id( $self->pool, name, 1 )); + } + void install( const Relation *rel ) + { + queue_push( &($self->queue), SOLVER_INSTALL_SOLVABLE_PROVIDES ); + /* FIXME: check: rel->pool == $self->pool */ + Reldep *rd = GETRELDEP( rel->pool, rel->id ); + queue_push( &($self->queue), rd->name ); + } + void erase( const Relation *rel ) + { + queue_push( &($self->queue), SOLVER_ERASE_SOLVABLE_PROVIDES ); + /* FIXME: check: rel->pool == $self->pool */ + Reldep *rd = GETRELDEP( rel->pool, rel->id ); + queue_push( &($self->queue), rd->name ); + } +#if defined(SWIGRUBY) %rename("empty?") empty(); - bool empty() - { return ($self->count == 0); } +#endif + int empty() + { return ( $self->queue.count == 0 ); } + + int size() + { return $self->queue.count >> 1; } +#if defined(SWIGRUBY) + %rename("clear!") clear(); +#endif void clear() - { queue_empty($self); } -}; -%newobject queue_init; -%delobject queue_free; + { queue_empty( &($self->queue) ); } + void each() + { + int i; + for (i = 0; i < $self->queue.count-1; ) { + int cmd = $self->queue.elements[i++]; + Id id = $self->queue.elements[i++]; + rb_yield(SWIG_NewPointerObj((void*) action_new( cmd, id ), SWIGTYPE_p__Action, 0)); + } + } +} + +#if 0 %include "solver.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] r8140 - in /trunk/sat-solver/bindings: ruby/CMakeLists.txt ruby/tests/rpmdb.rb satsolver.i
by kkaempf＠svn.opensuse.org 22 Dec '07

22 Dec '07

Author: kkaempf Date: Sat Dec 22 09:23:21 2007 New Revision: 8140 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8140&view=rev Log: make adding rpmdb easy as repo = pool.add_rpmdb( "/" ) make pool work on solvables (size, each, find) by default Added: trunk/sat-solver/bindings/ruby/tests/rpmdb.rb Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Sat Dec 22 09:23:21 2007 @@ -1,8 +1,5 @@ ADD_SUBDIRECTORY(tests) -#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") @@ -25,13 +22,15 @@ DEPENDS ${SWIG_OUTPUT} ) -ADD_LIBRARY( SatSolver SHARED "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) +SET(SatSolver_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c") +ADD_LIBRARY( SatSolver SHARED ${SatSolver_SRCS}) SET_TARGET_PROPERTIES( SatSolver PROPERTIES PREFIX "" ) ADD_DEPENDENCIES( SatSolver glue ) -INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) +INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) TARGET_LINK_LIBRARIES( SatSolver satsolver ) TARGET_LINK_LIBRARIES( SatSolver ${RUBY_LIBRARY} ) +TARGET_LINK_LIBRARIES( SatSolver ${DB43_LIBRARY} ) INSTALL(TARGETS SatSolver LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) \ No newline at end of file Added: trunk/sat-solver/bindings/ruby/tests/rpmdb.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/rpmdb.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/rpmdb.rb Sat Dec 22 09:23:21 2007 @@ -0,0 +1,25 @@ +$: << "../../../build/bindings/ruby" +# test adding rpmdb +require 'test/unit' +require 'SatSolver' + +class RpmdbTest < Test::Unit::TestCase + def test_rpmdb + pool = SatSolver::Pool.new + assert pool + pool.arch = "i686" + repo = pool.add_rpmdb( "/" ) + assert repo.size > 0 + puts "#{repo.size} installed packages" + i = 1 + name = nil + pool.each { |s| + puts s + name = s.name if i == 7 + i += 1 + break if i > 10 + } + s = pool.find( name ) + puts "Seventh: #{s}" + end +end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sat Dec 22 09:23:21 2007 @@ -18,9 +18,7 @@ #include "solver.h" #include "repo.h" #include "repo_solv.h" - -/*#include <sstream> */ - +#include "repo_rpmdb.h" typedef struct _Relation { Offset id; @@ -126,7 +124,14 @@ * Repo management */ - int repo_count() + Repo *add_rpmdb( const char *rootdir ) + { + Repo *repo = repo_create( $self, "system" ); + repo_add_rpmdb( repo, NULL, rootdir ); + return repo; + } + + int size_repo() { return $self->nrepos; } void each_repo() @@ -136,6 +141,16 @@ rb_yield(SWIG_NewPointerObj((void*) $self->repos[i], SWIGTYPE_p__Repo, 0)); } + Repo *find_repo( const char *name ) + { + int i; + for (i = 0; i < $self->nrepos; ++i ) { + if (!strcmp( $self->repos[i]->name, name )) + return $self->repos[i]; + } + return NULL; + } + /* * Solvable management */ @@ -143,15 +158,18 @@ int size() { return $self->nsolvables; } +#if defined(SWIGRUBY) + %rename( "installable?" ) installable( Solvable *s ); +#endif int installable( Solvable *s ) - { return pool_installable( $self,s ); } + { return pool_installable( $self, s ); } /* without the %rename, swig converts it to 'id_2solvable'. Ouch! */ %rename( "id2solvable" ) id2solvable( Id p ); Solvable *id2solvable(Id p) { return pool_id2solvable( $self, p ); } - void each_solvable() + void each() { Solvable *s; Id p; @@ -164,7 +182,7 @@ } Solvable * - select_solvable( char *name, Repo *repo = NULL ) + find( char *name, Repo *repo = NULL ) { Id id; Queue plist; @@ -265,6 +283,7 @@ %constant int REL_NAMESPACE = 18; Relation( Id id, Pool *pool) { return relation_new( id, pool ); } + %feature("autodoc", "1"); Relation( Pool *pool, const char *name, int op = 0, const char *evr = NULL ) { Id name_id = str2id( pool, name, 1 ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0