Author: zoltan
Date: 2007-02-28 13:13:27 -0500 (Wed, 28 Feb 2007)
New Revision: 73566
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/profiler.c
Log:
2007-02-28 Zoltan Varga <[EMAIL PROTECTED]>
* profiler.c: Applied patch from Tor Lillqvist ([EMAIL PROTECTED]) to
fix output
on Visual C++. Fixes #80671.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-02-28 16:47:03 UTC (rev 73565)
+++ trunk/mono/mono/metadata/ChangeLog 2007-02-28 18:13:27 UTC (rev 73566)
@@ -1,4 +1,8 @@
+2007-02-28 Zoltan Varga <[EMAIL PROTECTED]>
+ * profiler.c: Applied patch from Tor Lillqvist ([EMAIL PROTECTED]) to
fix output
+ on Visual C++. Fixes #80671.
+
Wed Feb 28 16:53:40 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* boehm-gc.c, null-gc.c, object.h, object.c: sgen gc fixes
Modified: trunk/mono/mono/metadata/profiler.c
===================================================================
--- trunk/mono/mono/metadata/profiler.c 2007-02-28 16:47:03 UTC (rev 73565)
+++ trunk/mono/mono/metadata/profiler.c 2007-02-28 18:13:27 UTC (rev 73566)
@@ -813,6 +813,14 @@
static void output_callers (MethodProfile *p);
+/* This isn't defined on older glib versions and on some platforms */
+#ifndef G_GUINT64_FORMAT
+#define G_GUINT64_FORMAT "ul"
+#endif
+#ifndef G_GINT64_FORMAT
+#define G_GINT64_FORMAT "lld"
+#endif
+
static void
output_profile (GList *funcs)
{
@@ -831,7 +839,7 @@
m = method_get_name (p->method);
fprintf (poutput, "########################\n");
fprintf (poutput, "% 8.3f ", (double) (p->total * 1000));
- fprintf (poutput, "%7llu ", (unsigned long long)p->count);
+ fprintf (poutput, "%7" G_GUINT64_FORMAT " ", (unsigned long
long)p->count);
fprintf (poutput, "% 8.3f ", (double) (p->total *
1000)/(double)p->count);
fprintf (poutput, " %s\n", m);
@@ -839,7 +847,7 @@
/* callers */
output_callers (p);
}
- fprintf (poutput, "Total number of calls: %lld\n", (long
long)total_calls);
+ fprintf (poutput, "Total number of calls: %" G_GINT64_FORMAT "\n",
(long long)total_calls);
}
typedef struct {
@@ -929,11 +937,6 @@
}
}
-/* This isn't defined on older glib versions and on some platforms */
-#ifndef G_GUINT64_FORMAT
-#define G_GUINT64_FORMAT "ul"
-#endif
-
static void
output_newobj_profile (GList *proflist)
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
