- move change calculation into pool

diff --git a/src/pool.c b/src/pool.c
index 869df6c10c1a5070175939e7a01e871ac7fc6027..5abead2b7b72d3a8c103e18cf62b397acd4720d2 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -931,5 +931,235 @@ pool_alloctmpspace(Pool *pool, int len)
   return pool->tmpspacebuf[n];
 }
 
+/*******************************************************************/
+
+struct mptree {
+  Id sibling;
+  Id child;
+  const char *comp;
+  int compl;
+  Id mountpoint;
+};
+
+struct ducbdata {
+  DUChanges *mps;
+  struct mptree *mptree;
+  int addsub;
+
+  Id *dirmap;
+  int nmap;
+  Repodata *olddata;
+};
+
+
+static int
+solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *value)
+{
+  struct ducbdata *cbd = cbdata;
+  Id mp;
+
+  if (data != cbd->olddata)
+    {
+      Id dn, mp, comp, *dirmap, *dirs;
+      int i, compl;
+      const char *compstr;
+      struct mptree *mptree;
+
+      /* create map from dir to mptree */
+      cbd->dirmap = sat_free(cbd->dirmap);
+      cbd->nmap = 0;
+      dirmap = sat_calloc(data->dirpool.ndirs, sizeof(Id));
+      mptree = cbd->mptree;
+      mp = 0;
+      for (dn = 2, dirs = data->dirpool.dirs + dn; dn < data->dirpool.ndirs; dn++)
+       {
+         comp = *dirs++;
+         if (comp <= 0)
+           {
+             mp = dirmap[-comp];
+             continue;
+           }
+         if (mp < 0)
+           {
+             /* unconnected */
+             dirmap[dn] = mp;
+             continue;
+           }
+         if (!mptree[mp].child)
+           {
+             dirmap[dn] = -mp;
+             continue;
+           }
+         if (data->localpool)
+           compstr = stringpool_id2str(&data->spool, comp);
+         else
+           compstr = id2str(data->repo->pool, comp);
+         compl = strlen(compstr);
+         for (i = mptree[mp].child; i; i = mptree[i].sibling)
+           if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl))
+             break;
+         dirmap[dn] = i ? i : -mp;
+       }
+      /* change dirmap to point to mountpoint instead of mptree */
+      for (dn = 0; dn < data->dirpool.ndirs; dn++)
+       {
+         mp = dirmap[dn];
+         dirmap[dn] = mptree[mp > 0 ? mp : -mp].mountpoint;
+       }
+      cbd->dirmap = dirmap;
+      cbd->nmap = data->dirpool.ndirs;
+      cbd->olddata = data;
+    }
+  if (value->id < 0 || value->id >= cbd->nmap)
+    return 0;
+  mp = cbd->dirmap[value->id];
+  if (mp < 0)
+    return 0;
+  if (cbd->addsub > 0)
+    {
+      cbd->mps[mp].kbytes += value->num;
+      cbd->mps[mp].files += value->num2;
+    }
+  else
+    {
+      cbd->mps[mp].kbytes -= value->num;
+      cbd->mps[mp].files -= value->num2;
+    }
+  return 0;
+}
+
+static void
+propagate_mountpoints(struct mptree *mptree, int pos, Id mountpoint)
+{
+  int i;
+  if (mptree[pos].mountpoint == -1)
+    mptree[pos].mountpoint = mountpoint;
+  else
+    mountpoint = mptree[pos].mountpoint;
+  for (i = mptree[pos].child; i; i = mptree[i].sibling)
+    propagate_mountpoints(mptree, i, mountpoint);
+}
+
+#define MPTREE_BLOCK 15
+
+void
+pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps)
+{
+  char *p;
+  const char *path, *compstr;
+  struct mptree *mptree;
+  int i, nmptree;
+  int pos, compl;
+  int mp;
+  struct ducbdata cbd;
+
+  cbd.mps = mps;
+  cbd.addsub = 0;
+  cbd.dirmap = 0;
+  cbd.nmap = 0;
+  cbd.olddata = 0;
+
+  mptree = sat_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK);
+
+  /* our root node */
+  mptree[0].sibling = 0;
+  mptree[0].child = 0;
+  mptree[0].comp = 0;
+  mptree[0].compl = 0;
+  mptree[0].mountpoint = -1;
+  nmptree = 1;
+  
+  /* create component tree */
+  for (mp = 0; mp < nmps; mp++)
+    {
+      mps[mp].kbytes = 0;
+      mps[mp].files = 0;
+      pos = 0;
+      path = mps[mp].path;
+      while(*path == '/')
+       path++;
+      while (*path)
+       {
+         if ((p = strchr(path, '/')) == 0)
+           {
+             compstr = path;
+             compl = strlen(compstr);
+             path += compl;
+           }
+         else
+           {
+             compstr = path;
+             compl = p - path;
+             path = p + 1;
+             while(*path == '/')
+               path++;
+           }
+          for (i = mptree[pos].child; i; i = mptree[i].sibling)
+           if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl))
+             break;
+         if (!i)
+           {
+             /* create new node */
+             mptree = sat_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK);
+             i = nmptree++;
+             mptree[i].sibling = mptree[pos].child;
+             mptree[i].child = 0;
+             mptree[i].comp = compstr;
+             mptree[i].compl = compl;
+             mptree[i].mountpoint = -1;
+             mptree[pos].child = i;
+           }
+         pos = i;
+       }
+      mptree[pos].mountpoint = mp;
+    }
+
+  propagate_mountpoints(mptree, 0, mptree[0].mountpoint);
+
+#if 0
+  for (i = 0; i < nmptree; i++)
+    {
+      printf("#%d sibling: %d\n", i, mptree[i].sibling);
+      printf("#%d child: %d\n", i, mptree[i].child);
+      printf("#%d comp: %s\n", i, mptree[i].comp);
+      printf("#%d compl: %d\n", i, mptree[i].compl);
+      printf("#%d mountpont: %d\n", i, mptree[i].mountpoint);
+    }
+#endif
+
+  cbd.mptree = mptree;
+  cbd.addsub = 1;
+  for (i = 0; i < pkgs->count; i++)
+    {
+      Id sp = pkgs->elements[i];
+      if (sp > 0)
+        repo_search(pool->solvables[sp].repo, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+    }
+  cbd.addsub = -1;
+  for (i = 0; i < pkgs->count; i++)
+    {
+      Id sp = pkgs->elements[i];
+      if (sp < 0)
+        repo_search(pool->solvables[-sp].repo, -sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+    }
+  sat_free(mptree);
+}
+
+int
+pool_calc_installsizechange(Pool *pool, Queue *pkgs)
+{
+  int i, change;
+
+  change = 0;
+  for (i = 0; i < pkgs->count; i++)
+    {
+      Id sp = pkgs->elements[i];
+      if (sp > 0)
+        change += repo_lookup_num(pool->solvables + sp, SOLVABLE_INSTALLSIZE);
+      else if (sp < 0)
+        change -= repo_lookup_num(pool->solvables - sp, SOLVABLE_INSTALLSIZE);
+    }
+  return change;
+}
 
 // EOF

diff --git a/src/pool.h b/src/pool.h
index bd55362d7ad753a198d90a0e3cf4ce372511ef3b..d48bff68bdf6ee1493f8c781c147963f24eb75ab 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -315,6 +315,15 @@ static inline void pool_setloadcallback(Pool *pool, FILE *(*cb)(struct _Pool *,
  */
 void pool_search(Pool *pool, Id p, Id key, const char *match, int flags, int (*callback)(void *cbdata, Solvable *s, struct _Repodata *data, struct _Repokey *key, struct _KeyValue *kv), void *cbdata);
 
+typedef struct _duchanges {
+  const char *path;
+  int kbytes;
+  int files;
+} DUChanges;
+
+void pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps);
+int pool_calc_installsizechange(Pool *pool, Queue *pkgs);
+
 /* loop over all providers of d */
 #define FOR_PROVIDES(v, vp, d)                                                 \
   for (vp = pool_whatprovides(pool, d) ; (v = *vp++) != 0; )

diff --git a/src/solver.c b/src/solver.c
index 5b5fe9ff784d1cb8f55a56de3cb1d5b885b483ee..9364b5ad823aa802055e264ff1c70cf5dcff6d00 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -3884,271 +3884,63 @@ solver_solve(Solver *solv, Queue *job)
 
 /***********************************************************************/
 
-struct mptree {
-  Id sibling;
-  Id child;
-  const char *comp;
-  int compl;
-  Id mountpoint;
-};
-
-struct ducbdata {
-  DUChanges *mps;
-  struct mptree *mptree;
-  int addsub;
-
-  Id *dirmap;
-  int nmap;
-  Repodata *olddata;
-};
-
-
-static int
-solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *value)
-{
-  struct ducbdata *cbd = cbdata;
-  Id mp;
-
-  if (data != cbd->olddata)
-    {
-      Id dn, mp, comp, *dirmap, *dirs;
-      int i, compl;
-      const char *compstr;
-      struct mptree *mptree;
-
-      /* create map from dir to mptree */
-      cbd->dirmap = sat_free(cbd->dirmap);
-      cbd->nmap = 0;
-      dirmap = sat_calloc(data->dirpool.ndirs, sizeof(Id));
-      mptree = cbd->mptree;
-      mp = 0;
-      for (dn = 2, dirs = data->dirpool.dirs + dn; dn < data->dirpool.ndirs; dn++)
-       {
-         comp = *dirs++;
-         if (comp <= 0)
-           {
-             mp = dirmap[-comp];
-             continue;
-           }
-         if (mp < 0)
-           {
-             /* unconnected */
-             dirmap[dn] = mp;
-             continue;
-           }
-         if (!mptree[mp].child)
-           {
-             dirmap[dn] = -mp;
-             continue;
-           }
-         if (data->localpool)
-           compstr = stringpool_id2str(&data->spool, comp);
-         else
-           compstr = id2str(data->repo->pool, comp);
-         compl = strlen(compstr);
-         for (i = mptree[mp].child; i; i = mptree[i].sibling)
-           if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl))
-             break;
-         dirmap[dn] = i ? i : -mp;
-       }
-      /* change dirmap to point to mountpoint instead of mptree */
-      for (dn = 0; dn < data->dirpool.ndirs; dn++)
-       {
-         mp = dirmap[dn];
-         dirmap[dn] = mptree[mp > 0 ? mp : -mp].mountpoint;
-       }
-      cbd->dirmap = dirmap;
-      cbd->nmap = data->dirpool.ndirs;
-      cbd->olddata = data;
-    }
-  if (value->id < 0 || value->id >= cbd->nmap)
-    return 0;
-  mp = cbd->dirmap[value->id];
-  if (mp < 0)
-    return 0;
-  if (cbd->addsub > 0)
-    {
-      cbd->mps[mp].kbytes += value->num;
-      cbd->mps[mp].files += value->num2;
-    }
-  else
-    {
-      cbd->mps[mp].kbytes -= value->num;
-      cbd->mps[mp].files -= value->num2;
-    }
-  return 0;
-}
-
-static void
-propagate_mountpoints(struct mptree *mptree, int pos, Id mountpoint)
-{
-  int i;
-  if (mptree[pos].mountpoint == -1)
-    mptree[pos].mountpoint = mountpoint;
-  else
-    mountpoint = mptree[pos].mountpoint;
-  for (i = mptree[pos].child; i; i = mptree[i].sibling)
-    propagate_mountpoints(mptree, i, mountpoint);
-}
-
-#define MPTREE_BLOCK 15
-
 void
-solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps)
+solver_calc_changed_pkgs(Solver *solv, Queue *pkgs)
 {
   Pool *pool = solv->pool;
-  Solvable *s;
-  char *p;
-  const char *path, *compstr;
-  struct mptree *mptree;
-  int i, nmptree;
-  int pos, compl;
-  int mp;
   Map installmap;
-  struct ducbdata cbd;
-
-  cbd.mps = mps;
-  cbd.addsub = 0;
-  cbd.dirmap = 0;
-  cbd.nmap = 0;
-  cbd.olddata = 0;
-
-  mptree = sat_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK);
-
-  /* our root node */
-  mptree[0].sibling = 0;
-  mptree[0].child = 0;
-  mptree[0].comp = 0;
-  mptree[0].compl = 0;
-  mptree[0].mountpoint = -1;
-  nmptree = 1;
-  
-  /* create component tree */
-  for (mp = 0; mp < nmps; mp++)
-    {
-      mps[mp].kbytes = 0;
-      mps[mp].files = 0;
-      pos = 0;
-      path = mps[mp].path;
-      while(*path == '/')
-       path++;
-      while (*path)
-       {
-         if ((p = strchr(path, '/')) == 0)
-           {
-             compstr = path;
-             compl = strlen(compstr);
-             path += compl;
-           }
-         else
-           {
-             compstr = path;
-             compl = p - path;
-             path = p + 1;
-             while(*path == '/')
-               path++;
-           }
-          for (i = mptree[pos].child; i; i = mptree[i].sibling)
-           if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl))
-             break;
-         if (!i)
-           {
-             /* create new node */
-             mptree = sat_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK);
-             i = nmptree++;
-             mptree[i].sibling = mptree[pos].child;
-             mptree[i].child = 0;
-             mptree[i].comp = compstr;
-             mptree[i].compl = compl;
-             mptree[i].mountpoint = -1;
-             mptree[pos].child = i;
-           }
-         pos = i;
-       }
-      mptree[pos].mountpoint = mp;
-    }
-
-  propagate_mountpoints(mptree, 0, mptree[0].mountpoint);
-
-#if 0
-  for (i = 0; i < nmptree; i++)
-    {
-      printf("#%d sibling: %d\n", i, mptree[i].sibling);
-      printf("#%d child: %d\n", i, mptree[i].child);
-      printf("#%d comp: %s\n", i, mptree[i].comp);
-      printf("#%d compl: %d\n", i, mptree[i].compl);
-      printf("#%d mountpont: %d\n", i, mptree[i].mountpoint);
-    }
-#endif
-
-  cbd.mptree = mptree;
+  Solvable *s;
+  int i;
+  Id p;
 
   /* create list of solvables that have to be installed */
   /* (this is actually just a simple sort) */
   map_init(&installmap, pool->nsolvables);
   for (i = 1; i < solv->decisionq.count; i++)
     {
-      Id sp = solv->decisionq.elements[i];
-      if (sp < 0)
+      Id p = solv->decisionq.elements[i];
+      if (p < 0)
        continue;
-      s = pool->solvables + sp;
+      s = pool->solvables + p;
       if (!s->repo)
        continue;
       if (solv->installed && s->repo == solv->installed)
        continue;
-      MAPSET(&installmap, sp);
-    }
-  /* run through install solvable dudata */
-  cbd.addsub = 1;
-  for (i = 1; i < pool->nsolvables; i++)
-    {
-      if (!MAPTST(&installmap, i))
-       continue;
-      s = pool->solvables + i;
-      repo_search(s->repo, i, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+      MAPSET(&installmap, p);
     }
-  map_free(&installmap);
+  for (p = 1; p < pool->nsolvables; p++)
+    if (MAPTST(&installmap, p))
+      queue_push(pkgs, p);
   /* run through erase solvable dudata */
   if (solv->installed)
     {
-      cbd.addsub = -1;
-      FOR_REPO_SOLVABLES(solv->installed, i, s)
+      FOR_REPO_SOLVABLES(solv->installed, p, s)
        {
-         if (solv->decisionmap[i] >= 0)
-           continue;
-         repo_search(solv->installed, i, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+         if (solv->decisionmap[p] < 0)
+           queue_push(pkgs, -p);
        }
     }
-  sat_free(cbd.dirmap);
-  sat_free(mptree);
+}
+
+void
+solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps)
+{
+  Queue pkgs;
+  queue_init(&pkgs);
+  solver_calc_changed_pkgs(solv, &pkgs);
+  pool_calc_duchanges(solv->pool, &pkgs, mps, nmps);
+  queue_free(&pkgs);
 }
 
 int
 solver_calc_installsizechange(Solver *solv)
 {
-  Pool *pool = solv->pool;
-  int i, change;
-  Id p;
-  Solvable *s;
-
-  change = 0;
-  for (i = 1; i < solv->decisionq.count; i++)
-    {
-      Id p = solv->decisionq.elements[i];
-      if (p < 0)
-       continue;
-      s = pool->solvables + p;
-      if (!s->repo)
-       continue;
-      if (solv->installed && s->repo == solv->installed)
-       continue;
-      change += repo_lookup_num(s, SOLVABLE_INSTALLSIZE);
-    }
-  if (solv->installed)
-    {
-      FOR_REPO_SOLVABLES(solv->installed, p, s)
-       if (solv->decisionmap[p] < 0)
-         change -= repo_lookup_num(s, SOLVABLE_INSTALLSIZE);
-    }
+  int change;
+  Queue pkgs;
+  queue_init(&pkgs);
+  solver_calc_changed_pkgs(solv, &pkgs);
+  change = pool_calc_installsizechange(solv->pool, &pkgs);
+  queue_free(&pkgs);
   return change;
 }
+

diff --git a/src/solver.h b/src/solver.h
index c603f8ee659da5f6721a6f57c3a3e704e29835d7..d251d12e30e22726ce2637e880d81d1ab29ea737 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -282,12 +282,7 @@ solver_is_enhancing(Solver *solv, Solvable *s)
   return 0;
 }
 
-typedef struct _duchanges {
-  const char *path;
-  int kbytes;
-  int files;
-} DUChanges;
-
+void solver_calc_changed_pkgs(Solver *solv, Queue *pkgs);
 void solver_calc_duchanges(Solver *solv, DUChanges *mps, int nmps);
 int solver_calc_installsizechange(Solver *solv);