From 087be2f1fbae2d7168732c7004d8963a3d9d21d8 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Fri, 18 Sep 2009 21:59:52 +0200 Subject: delta : add external cleanup script Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/alpm.h | 1 + lib/libalpm/delta.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 05ad82eb..b0805068 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -234,6 +234,7 @@ int alpm_pkg_has_scriptlet(pmpkg_t *pkg); int alpm_pkg_has_force(pmpkg_t *pkg); off_t alpm_pkg_download_size(pmpkg_t *newpkg); +alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg); /* * Deltas diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 523968ec..0fc37d97 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -71,7 +71,7 @@ off_t SYMEXPORT alpm_delta_get_size(pmdelta_t *delta) /** @} */ -static alpm_list_t *graph_init(alpm_list_t *deltas) +static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse) { alpm_list_t *i, *j; alpm_list_t *vertices = NULL; @@ -101,7 +101,8 @@ static alpm_list_t *graph_init(alpm_list_t *deltas) * 3_to_4 * If J 'from' is equal to I 'to', then J is a child of I. * */ - if(strcmp(d_j->from, d_i->to) == 0) { + if((!reverse && strcmp(d_j->from, d_i->to) == 0) || + (reverse && strcmp(d_j->to, d_i->from) == 0)) { v_i->children = alpm_list_add(v_i->children, v_j); } } @@ -233,7 +234,7 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, _alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to); - vertices = graph_init(deltas); + vertices = graph_init(deltas, 0); graph_init_size(vertices); dijkstra(vertices); bestsize = shortest_path(vertices, to, &bestpath); @@ -247,6 +248,45 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } +static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota) +{ + alpm_list_t *unused = NULL; + alpm_list_t *vertices; + alpm_list_t *i; + vertices = graph_init(deltas, 1); + + for(i = vertices; i; i = i->next) { + pmgraph_t *v = i->data; + pmdelta_t *vdelta = v->data; + if(strcmp(vdelta->to, to) == 0) + { + v->weight = vdelta->download_size; + } + } + dijkstra(vertices); + for(i = vertices; i; i = i->next) { + pmgraph_t *v = i->data; + pmdelta_t *vdelta = v->data; + if(v->weight > quota) { + unused = alpm_list_add(unused, vdelta->delta); + } + } + alpm_list_free_inner(vertices, _alpm_graph_free); + alpm_list_free(vertices); + return(unused); +} + +alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(pmpkg_t *pkg) +{ + off_t pkgsize = alpm_pkg_get_size(pkg); + alpm_list_t *unused = find_unused( + alpm_pkg_get_deltas(pkg), + alpm_pkg_get_filename(pkg), + pkgsize * MAX_DELTA_RATIO); + return(unused); +} + + /** Parses the string representation of a pmdelta_t object. * This function assumes that the string is in the correct format. * This format is as follows: -- cgit v1.2.3-70-g09d2