Imported Upstream version 0.7.91upstream/0.7.91upstream

1 files changed, 72 insertions, 63 deletions

diff --git a/summary.c b/summary.c
index 937da1a..9e22086 100644
--- a/summary.c
+++ b/summary.c
@@ -1,5 +1,6 @@
 /*
  * This file is part of ltrace.
+ * Copyright (C) 2012,2013 Petr Machata, Red Hat Inc.
  * Copyright (C) 2003,2008,2009 Juan Cespedes
  * Copyright (C) 2006 Ian Wienand
  *
@@ -27,81 +28,89 @@
 
 #include "common.h"
 
-static int num_entries = 0;
-static struct entry_st {
-	char *name;
-	int count;
+struct entry_st {
+	const char *name;
+	unsigned count;
 	struct timeval tv;
-} *entries = NULL;
+};
 
-static int tot_count = 0;
-static unsigned long int tot_usecs = 0;
+struct fill_struct_data {
+	struct vect entries;
+	unsigned tot_count;
+	unsigned long tot_usecs;
+};
 
-static void fill_struct(void *key, void *value, void *data)
+static enum callback_status
+fill_struct(const char **namep, struct opt_c_struct *st, void *u)
 {
-	struct opt_c_struct *st = (struct opt_c_struct *)value;
+	struct fill_struct_data *data = u;
+	struct entry_st entry = { *namep, st->count, st->tv };
+	if (VECT_PUSHBACK(&data->entries, &entry) < 0)
+		return CBS_STOP;
+
+	data->tot_count += st->count;
+	data->tot_usecs += 1000000 * st->tv.tv_sec;
+	data->tot_usecs += st->tv.tv_usec;
+	return CBS_CONT;
+}
 
-	entries = realloc(entries, (num_entries + 1) * sizeof(struct entry_st));
-	if (!entries) {
-		perror("realloc()");
-		exit(1);
-	}
-	entries[num_entries].name = (char *)key;
-	entries[num_entries].count = st->count;
-	entries[num_entries].tv = st->tv;
+static int
+compar(const struct entry_st *en1, const struct entry_st *en2)
+{
+	if (en2->tv.tv_sec - en1->tv.tv_sec)
+		return en2->tv.tv_sec - en1->tv.tv_sec;
+	else
+		return en2->tv.tv_usec - en1->tv.tv_usec;
+}
 
-	tot_count += st->count;
-	tot_usecs += 1000000 * st->tv.tv_sec;
-	tot_usecs += st->tv.tv_usec;
+static enum callback_status
+dump_one(struct entry_st *entry, void *u)
+{
+	struct fill_struct_data *data = u;
+	unsigned long long int c;
+	unsigned long long int p;
+	c = 1000000 * (int)entry->tv.tv_sec +
+		(int)entry->tv.tv_usec;
+	p = 100000 * c / data->tot_usecs + 5;
+	fprintf(options.output, "%3lu.%02lu %4d.%06d %11lu %9d %s\n",
+		(unsigned long int)(p / 1000),
+		(unsigned long int)((p / 10) % 100),
+		(int)entry->tv.tv_sec, (int)entry->tv.tv_usec,
+		(unsigned long int)(c / entry->count),
+		entry->count,
+#ifdef USE_DEMANGLE
+		options.demangle ? my_demangle(entry->name) :
+#endif
+		entry->name);
 
-	num_entries++;
+	return CBS_CONT;
 }
 
-static int compar(const void *a, const void *b)
+void
+show_summary(void)
 {
-	struct entry_st *en1, *en2;
+	struct fill_struct_data cdata = {};
+	VECT_INIT(&cdata.entries, struct entry_st);
 
-	en1 = (struct entry_st *)a;
-	en2 = (struct entry_st *)b;
+	if (dict_opt_c != NULL) {
+		DICT_EACH(dict_opt_c, const char *, struct opt_c_struct, NULL,
+			  fill_struct, &cdata);
 
-	if (en2->tv.tv_sec - en1->tv.tv_sec) {
-		return (en2->tv.tv_sec - en1->tv.tv_sec);
-	} else {
-		return (en2->tv.tv_usec - en1->tv.tv_usec);
+		VECT_QSORT(&cdata.entries, struct entry_st, &compar);
 	}
-}
 
-void show_summary(void)
-{
-	int i;
-
-	num_entries = 0;
-	entries = NULL;
-
-	dict_apply_to_all(dict_opt_c, fill_struct, NULL);
-
-	qsort(entries, num_entries, sizeof(*entries), compar);
-
-	fprintf(options.output, "%% time     seconds  usecs/call     calls      function\n");
-	fprintf(options.output, "------ ----------- ----------- --------- --------------------\n");
-	for (i = 0; i < num_entries; i++) {
-		unsigned long long int c;
-		unsigned long long int p;
-		c = 1000000 * (int)entries[i].tv.tv_sec +
-		    (int)entries[i].tv.tv_usec;
-		p = 100000 * c / tot_usecs + 5;
-		fprintf(options.output, "%3lu.%02lu %4d.%06d %11lu %9d %s\n",
-		       (unsigned long int)(p / 1000),
-		       (unsigned long int)((p / 10) % 100),
-		       (int)entries[i].tv.tv_sec, (int)entries[i].tv.tv_usec,
-		       (unsigned long int)(c / entries[i].count),
-		       entries[i].count,
-#ifdef USE_DEMANGLE
-		       options.demangle ? my_demangle(entries[i].name) :
-#endif
-		       entries[i].name);
-	}
-	fprintf(options.output, "------ ----------- ----------- --------- --------------------\n");
-	fprintf(options.output, "100.00 %4lu.%06lu             %9d total\n", tot_usecs / 1000000,
-	       tot_usecs % 1000000, tot_count);
+	fprintf(options.output,
+		"%% time     seconds  usecs/call     calls      function\n");
+	fprintf(options.output,
+		"------ ----------- ----------- --------- --------------------\n");
+
+	VECT_EACH(&cdata.entries, struct entry_st, NULL, dump_one, &cdata);
+
+	fprintf(options.output,
+		"------ ----------- ----------- --------- --------------------\n");
+	fprintf(options.output, "100.00 %4lu.%06lu             %9d total\n",
+		cdata.tot_usecs / 1000000,
+		cdata.tot_usecs % 1000000, cdata.tot_count);
+
+	vect_destroy(&cdata.entries, NULL, NULL);
 }