From 95c14c7a8aa742ffcca47ab47f99e7b4878eb306 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 18 Dec 2009 12:10:01 +0200 Subject: [PATCH] Convert collectTE() to manipulate the tsort data from tsortInfo directly --- lib/order.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/order.c b/lib/order.c index 7a19fe0..c1d7faf 100644 --- a/lib/order.c +++ b/lib/order.c @@ -379,20 +379,20 @@ static void collectTE(rpm_color_t prefcolor, rpmte q, rpmte * outer_queue, rpmte * outer_queue_end) { - int treex = rpmteTree(q); - int depth = rpmteDepth(q); char deptypechar = (rpmteType(q) == TR_REMOVED ? '-' : '+'); tsortInfo q_tsi = rpmteTSI(q); + int treex = q_tsi->tree; + int depth = q_tsi->depth; rpmlog(RPMLOG_DEBUG, "%5d%5d%5d%5d%5d %*s%c%s\n", - *newOrderCount, rpmteNpreds(q), + *newOrderCount, q_tsi->npreds, q_tsi->tsi_qcnt, treex, depth, (2 * depth), "", deptypechar, (rpmteNEVRA(q) ? rpmteNEVRA(q) : "???")); - (void) rpmteSetDegree(q, 0); + q_tsi->degree = 0; newOrder[*newOrderCount] = q; (*newOrderCount)++; @@ -408,10 +408,10 @@ static void collectTE(rpm_color_t prefcolor, rpmte q, if (p && (--p_tsi->tsi_count) == 0) { - (void) rpmteSetTree(p, treex); - (void) rpmteSetDepth(p, depth+1); + p_tsi->tree = treex; + p_tsi->depth = depth + 1; + p_tsi->degree = q_tsi->degree + 1; (void) rpmteSetParent(p, q); - (void) rpmteSetDegree(q, rpmteDegree(q)+1); if (q_tsi->tsi_SccIdx > 1 && q_tsi->tsi_SccIdx != p_tsi->tsi_SccIdx) { /* Relation point outside of this SCC: add to outside queue */ @@ -426,10 +426,10 @@ static void collectTE(rpm_color_t prefcolor, rpmte q, if (--SCCs[p_tsi->tsi_SccIdx].count == 0) { /* New SCC is ready, add this package as representative */ - (void) rpmteSetTree(p, treex); - (void) rpmteSetDepth(p, depth+1); + p_tsi->tree = treex; + p_tsi->depth = depth + 1; + p_tsi->degree = q_tsi->degree + 1; (void) rpmteSetParent(p, q); - (void) rpmteSetDegree(q, rpmteDegree(q)+1); if (outer_queue != NULL) { addQ(p, outer_queue, outer_queue_end, prefcolor); -- 2.7.4