Nabble - Gnome - Memprof

[save_profile_on_v06.patch]

--- memprof-0.6/profile.c	2004-01-23 13:22:01.000000000 +0200

+++ memprof-0.6_modif/profile.c	2008-06-26 16:59:12.000000000 +0300

@@ -20,6 +20,7 @@

 

 #include "profile.h"

 #include <glib.h>

+#include <errno.h>

 

 static GList *

 block_create_stack_list (Block *block, MPProcess *process, GHashTable *skip_hash)

@@ -435,71 +436,71 @@

     

     for (node = func->node; node != NULL; node = node->next)

     {

-	if (node->parent)

-	{

-	    if (!g_hash_table_lookup (callers_by_symbol, node->parent->symbol))

-	    {

-		ProfileFunc *caller = g_new (ProfileFunc, 1);

-		

-		caller->total = 0;

-		caller->self = 0;

-		caller->node = node->parent;

-		

-		g_hash_table_insert (

-		    callers_by_symbol, symbol_copy (node->parent->symbol), caller);

-		g_ptr_array_add (result, caller);

-	    }

-	}

-	else

-	{

-	    if (!spontaneous)

-	    {

-		spontaneous = g_new (ProfileFunc, 1);

-		spontaneous->total = 0;

-		spontaneous->self = 0;

-		spontaneous->node = NULL;

-		g_ptr_array_add (result, spontaneous);

-	    }

-	}

+		if (node->parent)

+		{

+			if (!g_hash_table_lookup (callers_by_symbol, node->parent->symbol))

+			{

+			ProfileFunc *caller = g_new (ProfileFunc, 1);

+			

+			caller->total = 0;

+			caller->self = 0;

+			caller->node = node->parent;

+			

+			g_hash_table_insert (

+				callers_by_symbol, symbol_copy (node->parent->symbol), caller);

+			g_ptr_array_add (result, caller);

+			}

+		}

+		else

+		{

+			if (!spontaneous)

+			{

+			spontaneous = g_new (ProfileFunc, 1);

+			spontaneous->total = 0;

+			spontaneous->self = 0;

+			spontaneous->node = NULL;

+			g_ptr_array_add (result, spontaneous);

+			}

+		}

     }

     

     for (node = func->node; node != NULL; node = node->next)

     {

-	ProfileNode *top_caller_node;

-	ProfileNode *top_callee_node;

-	ProfileFunc *caller;

-	ProfileNode *n;

+		ProfileNode *top_caller_node;

+		ProfileNode *top_callee_node;

+		ProfileFunc *caller;

+		ProfileNode *n;

 	

-	if (!node->parent)

-	{

-	    g_assert (spontaneous);

-	    caller = spontaneous;

-	}

-	else

-	    caller = g_hash_table_lookup (callers_by_symbol, node->parent->symbol);

-	

-	/* find topmost node/parent pair identical to this node/parent */

-	top_caller_node = node->parent;

-	top_callee_node = node;

-	for (n = node->parent; n && n->parent != NULL; n = n->parent)

-	{

-	    if (symbol_equal (n->symbol, node->symbol) &&

-		symbol_equal (n->parent->symbol, top_caller_node->symbol))

-	    {

-		top_caller_node = n->parent;

-		top_callee_node = n;

-	    }

-	}

-	if (!g_hash_table_lookup (marked_callers, top_caller_node))

-	{

-	    caller->total += top_callee_node->total;

-	    

-	    g_hash_table_insert (marked_callers, top_caller_node, GINT_TO_POINTER (1));

+		if (!node->parent)

+		{

+			g_assert (spontaneous);

+			caller = spontaneous;

+		}

+		else

+			caller = g_hash_table_lookup (callers_by_symbol, node->parent->symbol);

+		

+		/* find topmost node/parent pair identical to this node/parent */

+		top_caller_node = node->parent;

+		top_callee_node = node;

+		for (n = node->parent; n && n->parent != NULL; n = n->parent)

+		{

+			if (symbol_equal (n->symbol, node->symbol) &&

+				symbol_equal (n->parent->symbol, top_caller_node->symbol))

+				{

+				top_caller_node = n->parent;

+				top_callee_node = n;

+				}

+		}

+		if (!g_hash_table_lookup (marked_callers, top_caller_node))

+		{

+			caller->total += top_callee_node->total;

+			

+			g_hash_table_insert (marked_callers, top_caller_node, GINT_TO_POINTER (1));

+		}

+		

+		if (node->self > 0)

+			caller->self += node->self;

 	}

-	

-	if (node->self > 0)

-	    caller->self += node->self;

-    }

     

     g_hash_table_destroy (marked_callers);

     g_hash_table_destroy (callers_by_symbol);

@@ -507,19 +508,214 @@

     return result;

 }

 

+static gint

+compare_profile_funcs (gconstpointer a, gconstpointer b)

+{

+	const ProfileFunc *pa = * (const ProfileFunc**) a;

+	const ProfileFunc *pb = * (const ProfileFunc**) b;

+	if (pa->total > pb->total)

+		return -1;

+	if (pa->total < pb->total)

+		return 1;

+	return 0;

+}

+

+static GPtrArray *

+create_sorted_profile_funcs (GPtrArray *funcs)

+{

+	int i;

+	GPtrArray *functions;

+

+	functions = g_ptr_array_sized_new (funcs->len);

+

+	for (i = 0; i < funcs->len; ++i)

+		g_ptr_array_add (functions, funcs->pdata [i]);

+

+	g_ptr_array_sort (functions, compare_profile_funcs);

+

+	return functions;

+}

+

+static void

+output_callers (FILE* out, ProfileFunc *func)

+{

+	int i;

+	GPtrArray *profile_callers, *callers;

+

+	profile_callers = profile_func_create_caller_list (func);

+	callers         = create_sorted_profile_funcs (profile_callers);

+

+	fprintf (out, "  Callers (with count) that contribute at least for 1%%:\n");

+

+	for (i = 0; i < callers->len; ++i) {

+		const gchar* name;

+		unsigned int percent;

+		ProfileFunc *caller = callers->pdata [i];

+

+		if (caller->node) {

+			if (caller->node->symbol && caller->node->symbol->name)

+				name = caller->node->symbol->name;

+			else

+				name = "???";

+		}

+		else

+			name = "<spontaneous>";

+		percent = (caller->total * 100)/ func->total;

+		if (percent < 1)

+			continue;

+		fprintf (out, "    %10d %10d %3d %% %s\n", 

+				caller->self, caller->total, percent, name);

+	}

+

+	profile_caller_list_free (profile_callers);

+	g_ptr_array_free (callers, 1);

+}

+

+static gint

+compare_descendant_tree_nodes (gconstpointer a, gconstpointer b)

+{

+	const ProfileDescendantTreeNode *pa = * (const ProfileDescendantTreeNode **) a;

+	const ProfileDescendantTreeNode *pb = * (const ProfileDescendantTreeNode **) b;

+	if (pa->total > pb->total)

+		return -1;

+	if (pa->total < pb->total)

+		return 1;

+	return 0;

+}

+

+

+static GPtrArray *

+create_sorted_descendant_tree_nodes (GPtrArray *funcs)

+{

+	int i;

+	GPtrArray *functions;

+

+	functions = g_ptr_array_sized_new (funcs->len);

+

+	for (i = 0; i < funcs->len; ++i)

+		g_ptr_array_add (functions, funcs->pdata [i]);

+

+	g_ptr_array_sort (functions, compare_descendant_tree_nodes);

+

+	return functions;

+}

+static void

+output_descendants (FILE* out, ProfileFunc *func)

+{

+	int i;

+	ProfileDescendantTree *descendant_tree;

+	ProfileDescendantTreeNode *node;

+	GPtrArray *children;

+

+	descendant_tree = profile_func_create_descendant_tree (func);

+	node            = descendant_tree->roots->pdata [0];

+	children        = create_sorted_descendant_tree_nodes (node->children);

+

+	fprintf (out, "  Descendants (with count) that contribute at least for 1%%:\n");

+

+	for (i = 0; i < children->len; ++i) {

+		const gchar* name;

+		unsigned int percent;

+		ProfileDescendantTreeNode *child = children->pdata [i];

+

+		if (child->symbol && child->symbol->name) {

+			name = child->symbol->name;

+		}

+		else

+			name = "???";

+		percent = (child->total * 100)/ node->total;

+		if (percent < 1)

+			continue;

+		fprintf (out, "    %10d %10d %3d %% %s\n", 

+				child->self, child->total, percent, name);

+	}

+

+	profile_descendant_tree_free (descendant_tree);

+	g_ptr_array_free (children, 1);

+}

+

+

+

+static void

+output_profile_summary (FILE *out, guint n_bytes, GPtrArray *functions)

+{

+	int i;

+

+	fprintf (out, "      self      total total %% symbol\n");

+	fprintf (out, " --------- ---------- ------- ------------\n");

+

+	for (i = 0; i < functions->len; ++i) {

+		const gchar *name;

+		ProfileFunc *func = functions->pdata [i];

+		if (func->node->symbol && func->node->symbol->name)

+			name = func->node->symbol->name;

+		else

+			name = "???";

+		fprintf (out, "%10d %10d %5.2f %% %s\n", 

+				func->self, func->total,

+				func->total * 100.0 / (double) n_bytes,

+				name);

+	}

+}

+

+

+

+static void

+output_profile_details (FILE *out, guint n_bytes, GPtrArray *functions)

+{

+	int i;

+

+	for (i = 0; i < functions->len; ++i) {

+		const gchar *name;

+		ProfileFunc *func = functions->pdata [i];

+		if (func->node->symbol && func->node->symbol->name)

+			name = func->node->symbol->name;

+		else

+			name = "???";

+		fprintf (out, "########################\n");

+		fprintf (out, "%10d %10d %5.2f %% %s\n",

+				func->self, func->total,

+				func->total * 100.0 / (double) n_bytes,

+				name);

+		output_callers (out, func);

+		output_descendants (out, func);

+	}

+}

+

+

 void

 profile_caller_list_free	     (GPtrArray		     *caller_list)

 {

     int i;

-    

+

     for (i = 0; i < caller_list->len; ++i)

 	g_free (caller_list->pdata[i]);

-    

+

     g_ptr_array_free (caller_list, TRUE);

 }

 

+

 void

 profile_write (Profile *profile, const gchar *outfile)

 {

-    /* FIXME */

+   	FILE *out;

+	int i;

+	GPtrArray *functions;

+

+	out = fopen (outfile, "w");

+	if (!out) {

+		show_error (NULL, ERROR_MODAL, "Cannot open output file: %s\n",

+        	g_strerror (errno));

+		return;

+	}

+

+	functions = create_sorted_profile_funcs (profile->functions);

+

+	fprintf (out, "Total number of bytes profiled: %u\n", profile->n_bytes);

+

+	output_profile_summary (out, profile->n_bytes, functions);

+	output_profile_details (out, profile->n_bytes, functions);

+

+	g_ptr_array_free (functions, 1);

+	fclose (out);

 }


[func_names_on_trunk.patch]
Index: profile.c

===================================================================

--- profile.c	(revision 437)

+++ profile.c	(working copy)

@@ -593,8 +593,8 @@

 		ProfileFunc *caller = callers->pdata [i];

 

 		if (caller->node) {

-			if (caller->node->symbol)

-				name = caller->node->symbol;

+			if (caller->node->symbol && caller->node->symbol->name)

+				name = caller->node->symbol->name;

 			else

 				name = "???";

 		}

@@ -630,8 +630,8 @@

 		unsigned int percent;

 		ProfileDescendantTreeNode *child = children->pdata [i];

 

-		if (child->symbol) {

-			name = child->symbol;

+		if (child->symbol && child->symbol->name) {

+			name = child->symbol->name;

 		}

 		else

 			name = "???";

@@ -657,8 +657,8 @@

 	for (i = 0; i < functions->len; ++i) {

 		const gchar *name;

 		ProfileFunc *func = functions->pdata [i];

-		if (func->node->symbol)

-			name = func->node->symbol;

+		if (func->node->symbol && func->node->symbol->name)

+			name = func->node->symbol->name;

 		else

 			name = "???";

 		fprintf (out, "%10d %10d %5.2f %% %s\n", 

@@ -676,8 +676,8 @@

 	for (i = 0; i < functions->len; ++i) {

 		const gchar *name;

 		ProfileFunc *func = functions->pdata [i];

-		if (func->node->symbol)

-			name = func->node->symbol;

+		if (func->node->symbol && func->node->symbol->name)

+			name = func->node->symbol->name;

 		else

 			name = "???";

 		fprintf (out, "########################\n");


[memprof-x86-64.diff]
diff -ru memprof-0.6/bfdutils.c memprof-0.6-64/bfdutils.c

--- memprof-0.6/bfdutils.c	2006-07-28 04:26:41.000000000 +0300

+++ memprof-0.6-64/bfdutils.c	2007-06-18 12:37:45.658732218 +0300

@@ -183,7 +183,7 @@

 {

 	unsigned long file_crc = 0;

 	int fd;

-	char buffer[8*1024];

+	unsigned char buffer[8*1024];

 	int count;

 

 	fd = open (name, O_RDONLY);

diff -ru memprof-0.6/intercept.c memprof-0.6-64/intercept.c

--- memprof-0.6/intercept.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/intercept.c	2007-06-18 12:48:21.709250588 +0300

@@ -346,7 +346,7 @@

 	ThreadInfo *thread;

 	int old_errno = errno;

 

-	if (n_frames < 0)

+	if (n_frames < 0 || n_frames > 10000)

 	{

 			MI_DEBUG (("mi_write_stack - elide bogus foo\n"));

 			return;

diff -ru memprof-0.6/leakdetect.c memprof-0.6-64/leakdetect.c

--- memprof-0.6/leakdetect.c	2004-09-13 22:01:52.000000000 +0300

+++ memprof-0.6-64/leakdetect.c	2007-06-18 12:40:45.169289643 +0300

@@ -57,7 +57,7 @@

 }

 

 static gboolean

-read_proc_stat (int pid, char *status, guint *start_stack, guint *end_stack)

+read_proc_stat (int pid, char *status, gsize *start_stack, gsize *end_stack)

 {

 	gchar *fname;

 	gulong tstart_stack;

@@ -204,7 +204,7 @@

 		GList *map_list)

 {

 	GList *tmp_list;

-	guint start_stack, end_stack;

+	gsize start_stack, end_stack;

 

 	tmp_list = map_list;

 

@@ -365,7 +365,7 @@

 					 &mem[i]);

 		if (errno)

 		{

-			g_warning ("Cannot read word %d/%d in block %p: %s\n",

+			g_warning ("Cannot read word %d/%ld in block %p: %s\n",

 				   i, length, block->addr, g_strerror (errno));

 			g_free (addr);

 			return block_list;

diff -ru memprof-0.6/memprof.h memprof-0.6-64/memprof.h

--- memprof-0.6/memprof.h	2004-09-11 03:35:19.000000000 +0300

+++ memprof-0.6-64/memprof.h	2007-06-18 12:38:27.324093705 +0300

@@ -46,7 +46,7 @@

 

 typedef struct {

   /* Initial members of this struct must be identical to that of Symbol */

-  guint addr;

+  gsize addr;

   guint size;

   gchar *name;

   bfd *abfd;

@@ -59,7 +59,7 @@

 } Map;

 

 typedef struct {

-  guint addr;

+  gsize addr;

   guint size;

   gchar *name;

 } Symbol;

diff -ru memprof-0.6/mi-perfctr.c memprof-0.6-64/mi-perfctr.c

--- memprof-0.6/mi-perfctr.c	2002-09-05 22:16:38.000000000 +0300

+++ memprof-0.6-64/mi-perfctr.c	2007-06-18 12:32:30.886001384 +0300

@@ -61,10 +61,14 @@

     info.alloc.old_ptr = NULL;

     info.alloc.new_ptr = NULL;

     info.alloc.size = 1;

-    

+

+#ifdef __x86_64__

+    mi_call_with_signal_backtrace ((void *)ctx->rip, (void *)ctx->rbp, (void *)ctx->rsp,

+				   mi_write_stack, &info);

+#else

     mi_call_with_signal_backtrace ((void *)ctx->eip, (void *)ctx->ebp, (void *)ctx->esp,

 				   mi_write_stack, &info);

-

+#endif

     if (ioctl (perfctr_fd, VPERFCTR_IRESUME) < 0)

 	    mi_perror ("Error restarting handler interrupt");

 

diff -ru memprof-0.6/process.c memprof-0.6-64/process.c

--- memprof-0.6/process.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/process.c	2007-06-18 12:39:48.143794893 +0300

@@ -176,7 +176,8 @@

 	FILE *in;

 	gchar perms[26];

 	gchar file[256];

-	guint start, end, major, minor, inode;

+	gsize start, end;

+	guint major, minor, inode;

   

 	snprintf (buffer, 1023, "/proc/%d/maps", process->pid);

 

@@ -190,7 +191,7 @@

 	}

 

 	while (fgets(buffer, 1023, in)) {

-		int count = sscanf (buffer, "%x-%x %15s %*x %x:%x %u %255s",

+		int count = sscanf (buffer, "%lx-%lx %15s %*x %x:%x %u %255s",

 				    &start, &end, perms, &major, &minor, &inode, file);

 		if (count >= 6)	{

 			if (strcmp (perms, "r-xp") == 0) {

@@ -242,7 +243,7 @@

 }

 

 static Map *

-real_locate_map (MPProcess *process, guint addr)

+real_locate_map (MPProcess *process, gsize addr)

 {

 	GList *tmp_list = process->map_list;

 

@@ -260,8 +261,8 @@

 	return NULL;

 }

 

-Map *

-locate_map (MPProcess *process, guint addr)

+static Map *

+locate_map (MPProcess *process, gsize addr)

 {

 	Map *map = real_locate_map (process, addr);

 	if (!map)

@@ -287,12 +288,12 @@

 }

 

 const Symbol *

-process_locate_symbol (MPProcess *process, guint addr)

+process_locate_symbol (MPProcess *process, gsize addr)

 {

 	Symbol *data;

 	Map *map;

   

-	guint first, middle, last;

+	gsize first, middle, last;

 

 	map = locate_map (process, addr);

 	if (!map)

@@ -348,7 +349,7 @@

 		   const char **filename, char **functionname,

 		   unsigned int *line)

 {

-	Map *map = locate_map (process, (guint)address);

+	Map *map = locate_map (process, (gsize)address);

 	if (map) {

 		bfd_vma addr = (bfd_vma)address;

 		if (map->do_offset)

@@ -595,7 +596,7 @@

 	    gpointer     data)

 {

 	MIInfo info;

-	guint count;

+	gsize count;

 	MPProcess *input_process = data;

 	MPProcess *process = NULL;

   

@@ -933,7 +934,7 @@

 	char *fname;

 	char *result;

 	char *tmp = NULL;

-	int n = 0;

+	size_t n = 0;

 	FILE *in = NULL;

 

 	if (process->status == MP_PROCESS_DEFUNCT)

diff -ru memprof-0.6/process.h memprof-0.6-64/process.h

--- memprof-0.6/process.h	2003-12-19 01:04:30.000000000 +0200

+++ memprof-0.6-64/process.h	2007-06-18 12:35:08.244366542 +0300

@@ -131,7 +131,7 @@

 				     FILE               *out,

 				     StackElement       *stack);

 const Symbol *process_locate_symbol (MPProcess          *process,

-				     guint               addr);

+				     gsize               addr);

 

 char **     process_parse_exec      (const char         *exec_string);

 char *      process_find_exec       (char              **args);

diff -ru memprof-0.6/profile.c memprof-0.6-64/profile.c

--- memprof-0.6/profile.c	2004-01-23 13:22:01.000000000 +0200

+++ memprof-0.6-64/profile.c	2007-06-18 12:41:03.706450472 +0300

@@ -29,7 +29,7 @@

     

     for (element = block->stack; !STACK_ELEMENT_IS_ROOT (element); element = element->parent)

     {

-	const Symbol *symbol = process_locate_symbol (process, (guint)element->address);

+	const Symbol *symbol = process_locate_symbol (process, (gsize)element->address);

 	

 	if (symbol && symbol->name && g_hash_table_lookup (skip_hash, symbol->name))

 	    continue;

@@ -54,7 +54,7 @@

 	StackElement *element = list->data;

 	ProfileNode *match = NULL;

 	const Symbol *symbol =

-	    process_locate_symbol (profile->process, (guint)element->address);

+	    process_locate_symbol (profile->process, (gsize)element->address);

 	int i;

 	

 	for (i = 0; i < roots->len; ++i)

diff -ru memprof-0.6/server.c memprof-0.6-64/server.c

--- memprof-0.6/server.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/server.c	2007-06-18 12:41:21.483604705 +0300

@@ -182,7 +182,7 @@

 		g_hash_table_destroy (server->pid_table);

 	close (server->socket_fd);

 

-	g_slist_remove (socket_paths, server->socket_path);

+	socket_paths = g_slist_remove (socket_paths, server->socket_path);

 	g_free (server->socket_path);

 }

 

--- memprof-0.6/speedintercept.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/speedintercept.c	2007-06-18 12:54:49.524680864 +0300

@@ -155,13 +155,10 @@

 #define SIGHANDLER_FRAMES 2

 

 static void

-#if defined (__linux__) && defined (__i386__)

-sigprof_handler (int unused, struct sigcontext ctx)

-#else

-sigprof_handler (int unused)

-#endif

+sigprof_handler (int unused, siginfo_t *si, ucontext_t *ucontext)

 {

 	int saved_errno = errno;

+	struct sigcontext *ctx = (struct sigcontext *)&ucontext->uc_mcontext;

 	MIInfo info;

 

 	info.alloc.operation = MI_TIME;

@@ -169,11 +166,14 @@

 	info.alloc.new_ptr = NULL;

 	info.alloc.size = 1;

     

-#if defined (__linux__) && defined (__i386__)

-	mi_call_with_signal_backtrace ((void *)ctx.eip, (void *)ctx.ebp, (void *)ctx.esp,

+#ifdef __x86_64__

+	mi_call_with_signal_backtrace ((void *)ctx->rip, (void *)ctx->rbp, (void *)ctx->rsp,

+				       mi_write_stack, &info);

+#elif defined (__i386__)

+	mi_call_with_signal_backtrace ((void *)ctx->eip, (void *)ctx->ebp, (void *)ctx->esp,

 				       mi_write_stack, &info);

 #else

-	mi_call_with_backtrace (SIGHANDLER_FRAMES, saved_pc, mi_write_stack, &info);

+	mi_call_with_backtrace (SIGHANDLER_FRAMES, mi_write_stack, &info);

 #endif

 

 	if (profile_type == SPEED_PROF_ITIMER)

diff -ru memprof-0.6/stack-frame.c memprof-0.6-64/stack-frame.c

--- memprof-0.6/stack-frame.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/stack-frame.c	2007-06-18 12:23:38.815385498 +0300

@@ -72,7 +72,7 @@

 

 #define HAVE_FRAME_ACCESSORS

 

-#if defined (__GNUC__) && defined (__i386__)

+#if defined (__GNUC__)

 typedef struct stack_frame_struct stack_frame;

 struct stack_frame_struct {

     stack_frame *next;


[memprof-x86-64.diff]
diff -ru memprof-0.6/bfdutils.c memprof-0.6-64/bfdutils.c

--- memprof-0.6/bfdutils.c	2006-07-28 04:26:41.000000000 +0300

+++ memprof-0.6-64/bfdutils.c	2007-06-18 12:37:45.658732218 +0300

@@ -183,7 +183,7 @@

 {

 	unsigned long file_crc = 0;

 	int fd;

-	char buffer[8*1024];

+	unsigned char buffer[8*1024];

 	int count;

 

 	fd = open (name, O_RDONLY);

diff -ru memprof-0.6/intercept.c memprof-0.6-64/intercept.c

--- memprof-0.6/intercept.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/intercept.c	2007-06-18 12:48:21.709250588 +0300

@@ -346,7 +346,7 @@

 	ThreadInfo *thread;

 	int old_errno = errno;

 

-	if (n_frames < 0)

+	if (n_frames < 0 || n_frames > 10000)

 	{

 			MI_DEBUG (("mi_write_stack - elide bogus foo\n"));

 			return;

diff -ru memprof-0.6/leakdetect.c memprof-0.6-64/leakdetect.c

--- memprof-0.6/leakdetect.c	2004-09-13 22:01:52.000000000 +0300

+++ memprof-0.6-64/leakdetect.c	2007-06-18 12:40:45.169289643 +0300

@@ -57,7 +57,7 @@

 }

 

 static gboolean

-read_proc_stat (int pid, char *status, guint *start_stack, guint *end_stack)

+read_proc_stat (int pid, char *status, gsize *start_stack, gsize *end_stack)

 {

 	gchar *fname;

 	gulong tstart_stack;

@@ -204,7 +204,7 @@

 		GList *map_list)

 {

 	GList *tmp_list;

-	guint start_stack, end_stack;

+	gsize start_stack, end_stack;

 

 	tmp_list = map_list;

 

@@ -365,7 +365,7 @@

 					 &mem[i]);

 		if (errno)

 		{

-			g_warning ("Cannot read word %d/%d in block %p: %s\n",

+			g_warning ("Cannot read word %d/%ld in block %p: %s\n",

 				   i, length, block->addr, g_strerror (errno));

 			g_free (addr);

 			return block_list;

diff -ru memprof-0.6/memprof.h memprof-0.6-64/memprof.h

--- memprof-0.6/memprof.h	2004-09-11 03:35:19.000000000 +0300

+++ memprof-0.6-64/memprof.h	2007-06-18 12:38:27.324093705 +0300

@@ -46,7 +46,7 @@

 

 typedef struct {

   /* Initial members of this struct must be identical to that of Symbol */

-  guint addr;

+  gsize addr;

   guint size;

   gchar *name;

   bfd *abfd;

@@ -59,7 +59,7 @@

 } Map;

 

 typedef struct {

-  guint addr;

+  gsize addr;

   guint size;

   gchar *name;

 } Symbol;

diff -ru memprof-0.6/mi-perfctr.c memprof-0.6-64/mi-perfctr.c

--- memprof-0.6/mi-perfctr.c	2002-09-05 22:16:38.000000000 +0300

+++ memprof-0.6-64/mi-perfctr.c	2007-06-18 12:32:30.886001384 +0300

@@ -61,10 +61,14 @@

     info.alloc.old_ptr = NULL;

     info.alloc.new_ptr = NULL;

     info.alloc.size = 1;

-    

+

+#ifdef __x86_64__

+    mi_call_with_signal_backtrace ((void *)ctx->rip, (void *)ctx->rbp, (void *)ctx->rsp,

+				   mi_write_stack, &info);

+#else

     mi_call_with_signal_backtrace ((void *)ctx->eip, (void *)ctx->ebp, (void *)ctx->esp,

 				   mi_write_stack, &info);

-

+#endif

     if (ioctl (perfctr_fd, VPERFCTR_IRESUME) < 0)

 	    mi_perror ("Error restarting handler interrupt");

 

diff -ru memprof-0.6/process.c memprof-0.6-64/process.c

--- memprof-0.6/process.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/process.c	2007-06-18 12:39:48.143794893 +0300

@@ -176,7 +176,8 @@

 	FILE *in;

 	gchar perms[26];

 	gchar file[256];

-	guint start, end, major, minor, inode;

+	gsize start, end;

+	guint major, minor, inode;

   

 	snprintf (buffer, 1023, "/proc/%d/maps", process->pid);

 

@@ -190,7 +191,7 @@

 	}

 

 	while (fgets(buffer, 1023, in)) {

-		int count = sscanf (buffer, "%x-%x %15s %*x %x:%x %u %255s",

+		int count = sscanf (buffer, "%lx-%lx %15s %*x %x:%x %u %255s",

 				    &start, &end, perms, &major, &minor, &inode, file);

 		if (count >= 6)	{

 			if (strcmp (perms, "r-xp") == 0) {

@@ -242,7 +243,7 @@

 }

 

 static Map *

-real_locate_map (MPProcess *process, guint addr)

+real_locate_map (MPProcess *process, gsize addr)

 {

 	GList *tmp_list = process->map_list;

 

@@ -260,8 +261,8 @@

 	return NULL;

 }

 

-Map *

-locate_map (MPProcess *process, guint addr)

+static Map *

+locate_map (MPProcess *process, gsize addr)

 {

 	Map *map = real_locate_map (process, addr);

 	if (!map)

@@ -287,12 +288,12 @@

 }

 

 const Symbol *

-process_locate_symbol (MPProcess *process, guint addr)

+process_locate_symbol (MPProcess *process, gsize addr)

 {

 	Symbol *data;

 	Map *map;

   

-	guint first, middle, last;

+	gsize first, middle, last;

 

 	map = locate_map (process, addr);

 	if (!map)

@@ -348,7 +349,7 @@

 		   const char **filename, char **functionname,

 		   unsigned int *line)

 {

-	Map *map = locate_map (process, (guint)address);

+	Map *map = locate_map (process, (gsize)address);

 	if (map) {

 		bfd_vma addr = (bfd_vma)address;

 		if (map->do_offset)

@@ -595,7 +596,7 @@

 	    gpointer     data)

 {

 	MIInfo info;

-	guint count;

+	gsize count;

 	MPProcess *input_process = data;

 	MPProcess *process = NULL;

   

@@ -933,7 +934,7 @@

 	char *fname;

 	char *result;

 	char *tmp = NULL;

-	int n = 0;

+	size_t n = 0;

 	FILE *in = NULL;

 

 	if (process->status == MP_PROCESS_DEFUNCT)

diff -ru memprof-0.6/process.h memprof-0.6-64/process.h

--- memprof-0.6/process.h	2003-12-19 01:04:30.000000000 +0200

+++ memprof-0.6-64/process.h	2007-06-18 12:35:08.244366542 +0300

@@ -131,7 +131,7 @@

 				     FILE               *out,

 				     StackElement       *stack);

 const Symbol *process_locate_symbol (MPProcess          *process,

-				     guint               addr);

+				     gsize               addr);

 

 char **     process_parse_exec      (const char         *exec_string);

 char *      process_find_exec       (char              **args);

diff -ru memprof-0.6/profile.c memprof-0.6-64/profile.c

--- memprof-0.6/profile.c	2004-01-23 13:22:01.000000000 +0200

+++ memprof-0.6-64/profile.c	2007-06-18 12:41:03.706450472 +0300

@@ -29,7 +29,7 @@

     

     for (element = block->stack; !STACK_ELEMENT_IS_ROOT (element); element = element->parent)

     {

-	const Symbol *symbol = process_locate_symbol (process, (guint)element->address);

+	const Symbol *symbol = process_locate_symbol (process, (gsize)element->address);

 	

 	if (symbol && symbol->name && g_hash_table_lookup (skip_hash, symbol->name))

 	    continue;

@@ -54,7 +54,7 @@

 	StackElement *element = list->data;

 	ProfileNode *match = NULL;

 	const Symbol *symbol =

-	    process_locate_symbol (profile->process, (guint)element->address);

+	    process_locate_symbol (profile->process, (gsize)element->address);

 	int i;

 	

 	for (i = 0; i < roots->len; ++i)

diff -ru memprof-0.6/server.c memprof-0.6-64/server.c

--- memprof-0.6/server.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/server.c	2007-06-18 12:41:21.483604705 +0300

@@ -182,7 +182,7 @@

 		g_hash_table_destroy (server->pid_table);

 	close (server->socket_fd);

 

-	g_slist_remove (socket_paths, server->socket_path);

+	socket_paths = g_slist_remove (socket_paths, server->socket_path);

 	g_free (server->socket_path);

 }

 

--- memprof-0.6/speedintercept.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/speedintercept.c	2007-06-18 12:54:49.524680864 +0300

@@ -155,13 +155,10 @@

 #define SIGHANDLER_FRAMES 2

 

 static void

-#if defined (__linux__) && defined (__i386__)

-sigprof_handler (int unused, struct sigcontext ctx)

-#else

-sigprof_handler (int unused)

-#endif

+sigprof_handler (int unused, siginfo_t *si, ucontext_t *ucontext)

 {

 	int saved_errno = errno;

+	struct sigcontext *ctx = (struct sigcontext *)&ucontext->uc_mcontext;

 	MIInfo info;

 

 	info.alloc.operation = MI_TIME;

@@ -169,11 +166,14 @@

 	info.alloc.new_ptr = NULL;

 	info.alloc.size = 1;

     

-#if defined (__linux__) && defined (__i386__)

-	mi_call_with_signal_backtrace ((void *)ctx.eip, (void *)ctx.ebp, (void *)ctx.esp,

+#ifdef __x86_64__

+	mi_call_with_signal_backtrace ((void *)ctx->rip, (void *)ctx->rbp, (void *)ctx->rsp,

+				       mi_write_stack, &info);

+#elif defined (__i386__)

+	mi_call_with_signal_backtrace ((void *)ctx->eip, (void *)ctx->ebp, (void *)ctx->esp,

 				       mi_write_stack, &info);

 #else

-	mi_call_with_backtrace (SIGHANDLER_FRAMES, saved_pc, mi_write_stack, &info);

+	mi_call_with_backtrace (SIGHANDLER_FRAMES, mi_write_stack, &info);

 #endif

 

 	if (profile_type == SPEED_PROF_ITIMER)

diff -ru memprof-0.6/stack-frame.c memprof-0.6-64/stack-frame.c

--- memprof-0.6/stack-frame.c	2006-07-28 04:26:10.000000000 +0300

+++ memprof-0.6-64/stack-frame.c	2007-06-18 12:23:38.815385498 +0300

@@ -72,7 +72,7 @@

 

 #define HAVE_FRAME_ACCESSORS

 

-#if defined (__GNUC__) && defined (__i386__)

+#if defined (__GNUC__)

 typedef struct stack_frame_struct stack_frame;

 struct stack_frame_struct {

     stack_frame *next;


Memprof starts with its GUI, but it is completely empty. Nothing happens
when I press the Profile and Leak buttons! I have tried with different
test programs inclusive testmemprof. However, I noticed some error
messages when memprof was starting up: mi_write error <number>. Where
number was different for different runs. These messages are printed by
the function:
  int mi_write (int fd, const void *buf, int total)
defined in the file memintercept-utils.c:255.
I changed this line from:
  mi_debug ("mi_write error %d\n", errno);
to:
  mi_perror ("mi_write error");
To get better error messages. Now I got something about Bad Address or
Broken Pipe and Bad File Descriptor.
Then I printed out the total parameter to the above function and I got
some eight-nine figures numbers, i.e. it tried to write very large
buffers! I tracked these calls to the function:
  void mi_write_stack (int n_frames, void **frames, void  *data)
in the file intercept.c:365.
It turned out to be some requests to write very large stacks of about 3
millions frames! This only occurred early in the run and just a few (5?)
times. There is in this function a test to avoid writing stacks with a
negative number of frames. I changed this test so it only writes
reasonable sized stacks (less than 10000 frames) and now memprof seems
to work, at least most of the times. I guess these bad request are a bit
random and sometimes they are reasonable sized so they slip through the
test, but still bad.
Change the first line of:
  if (n_frames < 0) {
    MI_DEBUG (("mi_write_stack - elide bogus foo\n"));
    return;
  }
To:
  if (n_frames < 0 || n_frames>10000) {
Maybe this can be some help for others trying to use memprof and
hopefully for someone to do a real analysis and fix of the problem. I'm
not sure if the results produced, when available, are correct! But at
least the test program seems to give correct results.
-- 
chb
[memprof.diff]
Index: main.c

===================================================================

RCS file: /cvs/gnome/memprof/main.c,v

retrieving revision 1.36

diff -u -p -u -r1.36 main.c

--- main.c	11 Sep 2004 00:35:19 -0000	1.36

+++ main.c	29 Apr 2006 19:43:50 -0000

@@ -410,7 +410,8 @@ profile_selection_changed (GtkTreeSelect

 	GtkSortType old_sort_type;

 	gboolean was_sorted;

 

-	gtk_tree_selection_get_selected (selection, (GtkTreeModel **)&store, &selected);

+	if (!gtk_tree_selection_get_selected (selection, (GtkTreeModel **)&store, &selected))

+		return;

 

 	gtk_tree_model_get (GTK_TREE_MODEL (store), &selected,

 			    PROFILE_FUNC_FUNC, &func,

@@ -1226,6 +1230,18 @@ reset_profile_cb (GtkWidget *widget)

 		process_clear_input (pwin->process);

 }

 

+void

+record_button_toggled_cb (GtkWidget *widget)

+{

+	ProcessWindow *pwin = pwin_from_widget (widget);

+

+	if (gtk_toggle_tool_button_get_active

+			(GTK_TOGGLE_TOOL_BUTTON (widget)))

+		process_start_input (pwin->process);

+	else

+		process_stop_input (pwin->process);

+}

+

 static void

 string_view_init (GtkTreeView *tree_view)

 {

Index: memprof.glade

===================================================================

RCS file: /cvs/gnome/memprof/memprof.glade,v

retrieving revision 1.21

diff -u -p -u -r1.21 memprof.glade

--- memprof.glade	20 Sep 2003 20:33:44 -0000	1.21

+++ memprof.glade	29 Apr 2006 19:43:50 -0000

@@ -326,68 +335,120 @@

                  <property name="stock_pixmap">gtk-clear</property>

 		  <signal name="clicked" handler="reset_profile_cb" last_modification_time="Sat, 21 Jun 2003 20:02:39 GMT"/>

 		</widget>

+	      </child>

+

+	      <child>

+		<widget class="GtkToggleToolButton" id="record-button">

+		  <property name="visible">True</property>

+		  <property name="label" translatable="yes">Record</property>

+		  <property name="use_underline">True</property>

+		  <property name="stock_id">gtk-media-record</property>

+		  <property name="visible_horizontal">True</property>

+		  <property name="visible_vertical">True</property>

+		  <property name="is_important">False</property>

+		  <property name="active">True</property>

+		  <signal name="toggled" handler="record_button_toggled_cb" last_modification_time="Sat, 29 Apr 2006 19:36:29 GMT"/>

+		</widget>

 	      </child>

 	    </widget>

 	  </child>



Nabble - Gnome - Memprof

memprof 0.6.2 release ready for testing

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Re: memprof-list Digest, Vol 28, Issue 1

Maintainership of memprof

Obama -- The Judas Goat

Wake Up World! Meet the New Boss, Same as the Old Boss

memprof -- memory profiler patches

Announcing memprof-revived

open misses a param

Re: x86-64 support

Re: Is memprof only caring about unfreed memory?

Re: Is memprof only caring about unfreed memory?

Is memprof only caring about unfreed memory?

Re: help with memprof, doesnt do anything !!

x86-64 support

Re: help with memprof, doesnt do anything !!

No result at all in v0.6

No result at all in v0.6

memprof does not work

Can anyone explain these error for me?

Memprof 0.6

Re: speedprof 'Record' button ...

speedprof 'Record' button ...

how to use memprof in non gui mode

Re: how to use memprof 0.5.1 with out gui mode

how to use memprof 0.5.1 with out gui mode

Re: patches for memprof on current glibc

Re: patches for memprof on current glibc

patches for memprof on current glibc

memprof