X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fcg_arcs.c;h=a46b442d44fa9f7635c8901f20d8c38e1bed96cd;hb=52e54bd0c75b211d86700d99a0e218b043934a36;hp=d14238decc330b439ed0db9685379d94e2d13f01;hpb=6b84886ad5e6b53e7b3bb6d8c33685614364b58f;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/cg_arcs.c b/gprof/cg_arcs.c index d14238decc..a46b442d44 100644 --- a/gprof/cg_arcs.c +++ b/gprof/cg_arcs.c @@ -1,23 +1,36 @@ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 1993, 2001 + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include "libiberty.h" #include "gprof.h" +#include "search_list.h" +#include "source.h" +#include "symtab.h" #include "call_graph.h" #include "cg_arcs.h" #include "cg_dfn.h" @@ -25,6 +38,14 @@ #include "utils.h" #include "sym_ids.h" +static int cmp_topo (const PTR, const PTR); +static void propagate_time (Sym *); +static void cycle_time (void); +static void cycle_link (void); +static void inherit_flags (Sym *); +static void propagate_flags (Sym **); +static int cmp_total (const PTR, const PTR); + Sym *cycle_header; unsigned int num_cycles; Arc **arcs; @@ -35,7 +56,7 @@ unsigned int numarcs; * range covered by CHILD. */ Arc * -DEFUN (arc_lookup, (parent, child), Sym * parent AND Sym * child) +arc_lookup (Sym *parent, Sym *child) { Arc *arc; @@ -64,13 +85,12 @@ DEFUN (arc_lookup, (parent, child), Sym * parent AND Sym * child) * Add (or just increment) an arc: */ void -DEFUN (arc_add, (parent, child, count), - Sym * parent AND Sym * child AND int count) +arc_add (Sym *parent, Sym *child, unsigned long count) { static unsigned int maxarcs = 0; Arc *arc, **newarcs; - DBG (TALLYDEBUG, printf ("[arc_add] %d arcs from %s to %s\n", + DBG (TALLYDEBUG, printf ("[arc_add] %lu arcs from %s to %s\n", count, parent->name, child->name)); arc = arc_lookup (parent, child); if (arc) @@ -78,7 +98,7 @@ DEFUN (arc_add, (parent, child, count), /* * A hit: just increment the count. */ - DBG (TALLYDEBUG, printf ("[tally] hit %d += %d\n", + DBG (TALLYDEBUG, printf ("[tally] hit %lu += %lu\n", arc->count, count)); arc->count += count; return; @@ -102,7 +122,7 @@ DEFUN (arc_add, (parent, child, count), if (maxarcs == 0) maxarcs = 1; maxarcs *= 2; - + /* Allocate the new array. */ newarcs = (Arc **)xmalloc(sizeof (Arc *) * maxarcs); @@ -131,7 +151,7 @@ DEFUN (arc_add, (parent, child, count), static int -DEFUN (cmp_topo, (lp, rp), const PTR lp AND const PTR rp) +cmp_topo (const PTR lp, const PTR rp) { const Sym *left = *(const Sym **) lp; const Sym *right = *(const Sym **) rp; @@ -141,7 +161,7 @@ DEFUN (cmp_topo, (lp, rp), const PTR lp AND const PTR rp) static void -DEFUN (propagate_time, (parent), Sym * parent) +propagate_time (Sym *parent) { Arc *arc; Sym *child; @@ -211,7 +231,7 @@ DEFUN (propagate_time, (parent), Sym * parent) DBG (PROPDEBUG, printf ("[prop_time] child \t"); print_name (child); - printf (" with %f %f %d/%d\n", child->hist.time, + printf (" with %f %f %lu/%lu\n", child->hist.time, child->cg.child_time, arc->count, child->ncalls); printf ("[prop_time] parent\t"); print_name (parent); @@ -225,7 +245,7 @@ DEFUN (propagate_time, (parent), Sym * parent) * its members. */ static void -DEFUN_VOID (cycle_time) +cycle_time () { Sym *member, *cyc; @@ -249,7 +269,7 @@ DEFUN_VOID (cycle_time) static void -DEFUN_VOID (cycle_link) +cycle_link () { Sym *sym, *cyc, *member; Arc *arc; @@ -337,7 +357,7 @@ DEFUN_VOID (cycle_link) * fractions from parents. */ static void -DEFUN (inherit_flags, (child), Sym * child) +inherit_flags (Sym *child) { Sym *head, *parent, *member; Arc *arc; @@ -361,7 +381,7 @@ DEFUN (inherit_flags, (child), Sym * child) * is static (and all others are, too)) no time propagates * along this arc. */ - if (child->ncalls) + if (child->ncalls != 0) { child->cg.prop.fract += parent->cg.prop.fract * (((double) arc->count) / ((double) child->ncalls)); @@ -391,7 +411,7 @@ DEFUN (inherit_flags, (child), Sym * child) * arc is static (and all others are, too)) no time * propagates along this arc. */ - if (head->ncalls) + if (head->ncalls != 0) { head->cg.prop.fract += parent->cg.prop.fract * (((double) arc->count) / ((double) head->ncalls)); @@ -415,7 +435,7 @@ DEFUN (inherit_flags, (child), Sym * child) * and while we're here, sum time for functions. */ static void -DEFUN (propagate_flags, (symbols), Sym ** symbols) +propagate_flags (Sym **symbols) { int index; Sym *old_head, *child; @@ -515,7 +535,7 @@ DEFUN (propagate_flags, (symbols), Sym ** symbols) * first. All else being equal, compare by names. */ static int -DEFUN (cmp_total, (lp, rp), const PTR lp AND const PTR rp) +cmp_total (const PTR lp, const PTR rp) { const Sym *left = *(const Sym **) lp; const Sym *right = *(const Sym **) rp; @@ -572,7 +592,7 @@ DEFUN (cmp_total, (lp, rp), const PTR lp AND const PTR rp) * time bottom up and flags top down. */ Sym ** -DEFUN_VOID (cg_assemble) +cg_assemble () { Sym *parent, **time_sorted_syms, **top_sorted_syms; unsigned int index;