X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpoolid.c;h=52d98c38fa4ac3535f8047a3f4973be100ccacc8;hb=447441ca05a1c100689afab5281f6bae32d97c83;hp=a0059e276a1e352b847dce59fc712eef653fe657;hpb=5f695432999e33b16408bca06d5e50c846d147cf;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/poolid.c b/src/poolid.c
index a0059e2..52d98c3 100644
--- a/src/poolid.c
+++ b/src/poolid.c
@@ -24,68 +24,85 @@
 /* intern string into pool, return id */
 
 Id
-str2id(Pool *pool, const char *str, int create)
+pool_str2id(Pool *pool, const char *str, int create)
 {
   int oldnstrings = pool->ss.nstrings;
   Id id = stringpool_str2id(&pool->ss, str, create);
   if (create && pool->whatprovides && oldnstrings != pool->ss.nstrings && (id & WHATPROVIDES_BLOCK) == 0)
     {
       /* grow whatprovides array */
-      pool->whatprovides = sat_realloc(pool->whatprovides, (id + (WHATPROVIDES_BLOCK + 1)) * sizeof(Offset));
+      pool->whatprovides = solv_realloc(pool->whatprovides, (id + (WHATPROVIDES_BLOCK + 1)) * sizeof(Offset));
       memset(pool->whatprovides + id, 0, (WHATPROVIDES_BLOCK + 1) * sizeof(Offset));
     }
   return id;
 }
 
 Id
-strn2id(Pool *pool, const char *str, unsigned int len, int create)
+pool_strn2id(Pool *pool, const char *str, unsigned int len, int create)
 {
   int oldnstrings = pool->ss.nstrings;
   Id id = stringpool_strn2id(&pool->ss, str, len, create);
   if (create && pool->whatprovides && oldnstrings != pool->ss.nstrings && (id & WHATPROVIDES_BLOCK) == 0)
     {
       /* grow whatprovides array */
-      pool->whatprovides = sat_realloc(pool->whatprovides, (id + (WHATPROVIDES_BLOCK + 1)) * sizeof(Offset));
+      pool->whatprovides = solv_realloc(pool->whatprovides, (id + (WHATPROVIDES_BLOCK + 1)) * sizeof(Offset));
       memset(pool->whatprovides + id, 0, (WHATPROVIDES_BLOCK + 1) * sizeof(Offset));
     }
   return id;
 }
 
-Id
-rel2id(Pool *pool, Id name, Id evr, int flags, int create)
+void
+pool_resize_rels_hash(Pool *pool, int numnew)
 {
-  Hashval h;
-  unsigned int hh;
-  Hashmask hashmask;
+  Hashval h, hh, hashmask;
+  Hashtable hashtbl;
   int i;
+  Reldep *rd;
+
+  if (numnew <= 0)
+    return;
+  hashmask = mkmask(pool->nrels + numnew);
+  if (hashmask <= pool->relhashmask)
+    return;    /* same as before */
+
+  /* realloc hash table */
+  pool->relhashmask = hashmask;
+  solv_free(pool->relhashtbl);
+  pool->relhashtbl = hashtbl = solv_calloc(hashmask + 1, sizeof(Id));
+
+  /* rehash all rels into new hashtable */
+  for (i = 1, rd = pool->rels + i; i < pool->nrels; i++, rd++)
+    {
+      h = relhash(rd->name, rd->evr, rd->flags) & hashmask;
+      hh = HASHCHAIN_START;
+      while (hashtbl[h])
+	h = HASHCHAIN_NEXT(h, hh, hashmask);
+      hashtbl[h] = i;
+    }
+}
+
+Id
+pool_rel2id(Pool *pool, Id name, Id evr, int flags, int create)
+{
+  Hashval h, hh, hashmask;
   Id id;
   Hashtable hashtbl;
   Reldep *ran;
 
-  hashmask = pool->relhashmask;
-  hashtbl = pool->relhashtbl;
-  ran = pool->rels;
-  
+
   /* extend hashtable if needed */
-  if (pool->nrels * 2 > hashmask)
+  hashmask = pool->relhashmask;
+  if ((Hashval)pool->nrels * 2 > hashmask)
     {
-      sat_free(pool->relhashtbl);
-      pool->relhashmask = hashmask = mkmask(pool->nrels + REL_BLOCK);
-      pool->relhashtbl = hashtbl = sat_calloc(hashmask + 1, sizeof(Id));
-      // rehash all rels into new hashtable
-      for (i = 1; i < pool->nrels; i++)
-	{
-	  h = relhash(ran[i].name, ran[i].evr, ran[i].flags) & hashmask;
-	  hh = HASHCHAIN_START;
-	  while (hashtbl[h])
-	    h = HASHCHAIN_NEXT(h, hh, hashmask);
-	  hashtbl[h] = i;
-	}
+      pool_resize_rels_hash(pool, REL_BLOCK);
+      hashmask = pool->relhashmask;
     }
-  
+  hashtbl = pool->relhashtbl;
+
   /* compute hash and check for match */
   h = relhash(name, evr, flags) & hashmask;
   hh = HASHCHAIN_START;
+  ran = pool->rels;
   while ((id = hashtbl[h]) != 0)
     {
       if (ran[id].name == name && ran[id].evr == evr && ran[id].flags == flags)
@@ -100,7 +117,7 @@ rel2id(Pool *pool, Id name, Id evr, int flags, int create)
 
   id = pool->nrels++;
   /* extend rel space if needed */
-  pool->rels = sat_extend(pool->rels, id, 1, sizeof(Reldep), REL_BLOCK);
+  pool->rels = solv_extend(pool->rels, id, 1, sizeof(Reldep), REL_BLOCK);
   hashtbl[h] = id;
   ran = pool->rels + id;
   ran->name = name;
@@ -110,25 +127,23 @@ rel2id(Pool *pool, Id name, Id evr, int flags, int create)
   /* extend whatprovides_rel if needed */
   if (pool->whatprovides_rel && (id & WHATPROVIDES_BLOCK) == 0)
     {
-      pool->whatprovides_rel = sat_realloc2(pool->whatprovides_rel, id + (WHATPROVIDES_BLOCK + 1), sizeof(Offset));
+      pool->whatprovides_rel = solv_realloc2(pool->whatprovides_rel, id + (WHATPROVIDES_BLOCK + 1), sizeof(Offset));
       memset(pool->whatprovides_rel + id, 0, (WHATPROVIDES_BLOCK + 1) * sizeof(Offset));
     }
   return MAKERELDEP(id);
 }
 
 
-// Id -> String
-// for rels (returns name only) and strings
-// 
+/* Id -> String
+ * for rels (returns name only) and strings
+ */
 const char *
-id2str(Pool *pool, Id id)
+pool_id2str(const Pool *pool, Id id)
 {
-  if (ISRELDEP(id))
+  while (ISRELDEP(id))
     {
       Reldep *rd = GETRELDEP(pool, id);
-      if (ISRELDEP(rd->name))
-	return "REL";
-      return pool->ss.stringspace + pool->ss.strings[rd->name];
+      id = rd->name;
     }
   return pool->ss.stringspace + pool->ss.strings[id];
 }
@@ -145,31 +160,68 @@ static const char *rels[] = {
 };
 
 
-// get operator for RelId
+/* get operator for RelId */
 const char *
-id2rel(Pool *pool, Id id)
+pool_id2rel(const Pool *pool, Id id)
 {
   Reldep *rd;
   if (!ISRELDEP(id))
     return "";
   rd = GETRELDEP(pool, id);
+
   switch (rd->flags)
     {
-    case 0: case 1: case 2: case 3:
-    case 4: case 5: case 6: case 7:
-      return rels[rd->flags & 7];
+    /* debian special cases < and > */
+    /* haiku special cases <> (maybe we should use != for the others as well */
+    case 0: case REL_EQ: case REL_GT | REL_EQ:
+    case REL_LT | REL_EQ: case REL_LT | REL_EQ | REL_GT:
+#if !defined(DEBIAN) && !defined(MULTI_SEMANTICS)
+    case REL_LT: case REL_GT:
+#endif
+#if !defined(HAIKU) && !defined(MULTI_SEMANTICS)
+    case REL_LT | REL_GT:
+#endif
+      return rels[rd->flags];
+#if defined(DEBIAN) || defined(MULTI_SEMANTICS)
+    case REL_GT:
+      return pool->disttype == DISTTYPE_DEB ? " >> " : rels[rd->flags];
+    case REL_LT:
+      return pool->disttype == DISTTYPE_DEB ? " << " : rels[rd->flags];
+#endif
+#if defined(HAIKU) || defined(MULTI_SEMANTICS)
+    case REL_LT | REL_GT:
+      return pool->disttype == DISTTYPE_HAIKU ? " != " : rels[rd->flags];
+#endif
     case REL_AND:
-      return " & ";
+      return pool->disttype == DISTTYPE_RPM ? " and " : " & ";
     case REL_OR:
-      return " | ";
+      return pool->disttype == DISTTYPE_RPM ? " or " : " | ";
     case REL_WITH:
-      return " + ";
+      return pool->disttype == DISTTYPE_RPM ? " with " : " + ";
+    case REL_WITHOUT:
+      return pool->disttype == DISTTYPE_RPM ? " without " : " - ";
     case REL_NAMESPACE:
       return " NAMESPACE ";	/* actually not used in dep2str */
     case REL_ARCH:
       return ".";
+    case REL_MULTIARCH:
+      return ":";
     case REL_FILECONFLICT:
       return " FILECONFLICT ";
+    case REL_COND:
+      return pool->disttype == DISTTYPE_RPM ? " if " : " IF ";
+    case REL_UNLESS:
+      return pool->disttype == DISTTYPE_RPM ? " unless " : " UNLESS ";
+    case REL_COMPAT:
+      return " compat >= ";
+    case REL_KIND:
+      return " KIND ";
+    case REL_ELSE:
+      return pool->disttype == DISTTYPE_RPM ? " else " : " ELSE ";
+    case REL_CONDA:
+      return " ";
+    case REL_ERROR:
+      return " ERROR ";
     default:
       break;
     }
@@ -177,10 +229,9 @@ id2rel(Pool *pool, Id id)
 }
 
 
-// get e:v.r for Id
-// 
+/* get e:v.r for Id */
 const char *
-id2evr(Pool *pool, Id id)
+pool_id2evr(const Pool *pool, Id id)
 {
   Reldep *rd;
   if (!ISRELDEP(id))
@@ -192,7 +243,7 @@ id2evr(Pool *pool, Id id)
 }
 
 static int
-dep2strlen(Pool *pool, Id id)
+dep2strlen(const Pool *pool, Id id)
 {
   int l = 0;
 
@@ -200,31 +251,41 @@ dep2strlen(Pool *pool, Id id)
     {
       Reldep *rd = GETRELDEP(pool, id);
       /* add 2 for parens */
-      l += 2 + dep2strlen(pool, rd->name) + strlen(id2rel(pool, id));
+      l += 2 + dep2strlen(pool, rd->name) + strlen(pool_id2rel(pool, id));
       id = rd->evr;
     }
   return l + strlen(pool->ss.stringspace + pool->ss.strings[id]);
 }
 
 static void
-dep2strcpy(Pool *pool, char *p, Id id, int oldrel)
+dep2strcpy(const Pool *pool, char *p, Id id, int oldrel)
 {
   while (ISRELDEP(id))
     {
       Reldep *rd = GETRELDEP(pool, id);
-      if (oldrel == REL_AND || oldrel == REL_OR || oldrel == REL_WITH)
-	if (rd->flags == REL_AND || rd->flags == REL_OR || rd->flags == REL_WITH)
-	  if (oldrel != rd->flags)
+      int rel = rd->flags;
+      if (oldrel == REL_AND || oldrel == REL_OR || oldrel == REL_WITH || oldrel == REL_WITHOUT || oldrel == REL_COND || oldrel == REL_UNLESS || oldrel == REL_ELSE || oldrel == -1)
+	if (rel == REL_AND || rel == REL_OR || rel == REL_WITH || rel == REL_WITHOUT || rel == REL_COND || rel == REL_UNLESS || rel == REL_ELSE)
+	  if ((oldrel != rel || rel == REL_COND || rel == REL_UNLESS || rel == REL_ELSE) && !((oldrel == REL_COND || oldrel == REL_UNLESS) && rel == REL_ELSE))
 	    {
 	      *p++ = '(';
 	      dep2strcpy(pool, p, rd->name, rd->flags);
 	      p += strlen(p);
-	      strcpy(p, id2rel(pool, id));
+	      strcpy(p, pool_id2rel(pool, id));
 	      p += strlen(p);
 	      dep2strcpy(pool, p, rd->evr, rd->flags);
 	      strcat(p, ")");
 	      return;
 	    }
+      if (rd->flags == REL_KIND)
+	{
+	  dep2strcpy(pool, p, rd->evr, rd->flags);
+	  p += strlen(p);
+	  *p++ = ':';
+	  id = rd->name;
+	  oldrel = rd->flags;
+	  continue;
+	}
       dep2strcpy(pool, p, rd->name, rd->flags);
       p += strlen(p);
       if (rd->flags == REL_NAMESPACE)
@@ -239,7 +300,7 @@ dep2strcpy(Pool *pool, char *p, Id id, int oldrel)
 	  *p = 0;
 	  return;
 	}
-      strcpy(p, id2rel(pool, id));
+      strcpy(p, pool_id2rel(pool, id));
       p += strlen(p);
       id = rd->evr;
       oldrel = rd->flags;
@@ -248,37 +309,47 @@ dep2strcpy(Pool *pool, char *p, Id id, int oldrel)
 }
 
 const char *
-dep2str(Pool *pool, Id id)
+pool_dep2str(Pool *pool, Id id)
 {
   char *p;
   if (!ISRELDEP(id))
     return pool->ss.stringspace + pool->ss.strings[id];
   p = pool_alloctmpspace(pool, dep2strlen(pool, id) + 1);
-  dep2strcpy(pool, p, id, 0);
+  dep2strcpy(pool, p, id, pool->disttype == DISTTYPE_RPM ? -1 : 0);
   return p;
 }
 
+static void
+pool_free_rels_hash(Pool *pool)
+{
+  pool->relhashtbl = solv_free(pool->relhashtbl);
+  pool->relhashmask = 0;
+}
+
 void
 pool_shrink_strings(Pool *pool)
 {
+  /* free excessive big hashes */
+  if (pool->ss.stringhashmask && pool->ss.stringhashmask > mkmask(pool->ss.nstrings + 8192))
+    stringpool_freehash(&pool->ss);
   stringpool_shrink(&pool->ss);
 }
 
 void
 pool_shrink_rels(Pool *pool)
 {
-  pool->rels = sat_extend_resize(pool->rels, pool->nrels, sizeof(Reldep), REL_BLOCK);
+  /* free excessive big hashes */
+  if (pool->relhashmask && pool->relhashmask > mkmask(pool->nrels + 4096))
+    pool_free_rels_hash(pool);
+  pool->rels = solv_extend_resize(pool->rels, pool->nrels, sizeof(Reldep), REL_BLOCK);
 }
 
-// reset all hash tables
-// 
+/* free all hash tables */
 void
 pool_freeidhashes(Pool *pool)
 {
-  pool->ss.stringhashtbl = sat_free(pool->ss.stringhashtbl);
-  pool->ss.stringhashmask = 0;
-  pool->relhashtbl = sat_free(pool->relhashtbl);
-  pool->relhashmask = 0;
+  stringpool_freehash(&pool->ss);
+  pool_free_rels_hash(pool);
 }
 
-// EOF
+/* EOF */