rpl/src/gestion_objets.c - diff

Return to gestion_objets.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/gestion_objets.c between versions 1.16 and 1.17

version 1.16, 2010/05/13 19:09:18	version 1.17, 2010/05/16 19:36:20
Line 877 liberation(struct_processus *s_etat_proc	Line 877 liberation(struct_processus *s_etat_proc
{	{
if (decrementation_atomique(s_objet) > 0)	if (decrementation_atomique(s_objet) > 0)
{	{
	liberation(s_etat_processus, (((struct_fichier )
	(*s_objet).objet)).format);
return;	return;
}	}

Line 1208 liberation(struct_processus *s_etat_proc	Line 1210 liberation(struct_processus *s_etat_proc
{	{
if (decrementation_atomique(s_objet) > 0)	if (decrementation_atomique(s_objet) > 0)
{	{
	liberation(s_etat_processus, (((struct_socket )
	(*s_objet).objet)).format);
return;	return;
}	}

Line 1749 copie_objet(struct_processus *s_etat_pro	Line 1753 copie_objet(struct_processus *s_etat_pro
if (type == 'P')	if (type == 'P')
{	{
incrementation_atomique(s_objet);	incrementation_atomique(s_objet);

	if (((((struct_fichier ) ((*s_objet).objet))).format =
	copie_objet(s_etat_processus, (((struct_fichier )
	((*s_objet).objet))).format, 'P')) == NULL)
	{
	return(NULL);
	}

return(s_objet);	return(s_objet);
}	}

Line 2265 copie_objet(struct_processus *s_etat_pro	Line 2277 copie_objet(struct_processus *s_etat_pro
if (type == 'P')	if (type == 'P')
{	{
incrementation_atomique(s_objet);	incrementation_atomique(s_objet);

	if (((((struct_socket ) ((*s_nouvel_objet).objet))).format =
	copie_objet(s_etat_processus, (((struct_socket )
	((*s_objet).objet))).format, 'P')) == NULL)
	{
	return(NULL);
	}

return(s_objet);	return(s_objet);
}	}

Line 3555 typedef struct memoire	Line 3575 typedef struct memoire
int profondeur;	int profondeur;
# endif	# endif
struct memoire *suivant;	struct memoire *suivant;
pthread_t thread;
pid_t pid;
} struct_memoire;	} struct_memoire;

static struct_memoire *debug = NULL;	static struct_memoire *debug = NULL;
Line 3564 static unsigned long long ordre = 0;	Line 3582 static unsigned long long ordre = 0;
static pthread_mutex_t mutex_allocation = PTHREAD_MUTEX_INITIALIZER;	static pthread_mutex_t mutex_allocation = PTHREAD_MUTEX_INITIALIZER;

#define check(a, b) ((strcmp(#a, fonction) == 0) && (ligne == b))	#define check(a, b) ((strcmp(#a, fonction) == 0) && (ligne == b))
	#define CORE_DUMP

void *	void *
debug_memoire_ajout(size_t taille, const unsigned char *fonction,	debug_memoire_ajout(size_t taille, const unsigned char *fonction,
Line 3591 debug_memoire_ajout(size_t taille, const	Line 3610 debug_memoire_ajout(size_t taille, const
(*debug).ligne = ligne;	(*debug).ligne = ligne;
(*debug).taille = taille;	(*debug).taille = taille;
(*debug).ordre = ordre;	(*debug).ordre = ordre;
(*debug).thread = pthread_self();
(*debug).pid = getpid();

# ifdef __BACKTRACE	# ifdef __BACKTRACE
(debug).profondeur = backtrace((debug).pile, PROFONDEUR_PILE);	(debug).profondeur = backtrace((debug).pile, PROFONDEUR_PILE);
Line 3741 debug_memoire_retrait(void *pointeur)	Line 3758 debug_memoire_retrait(void *pointeur)
}	}

void	void
debug_memoire_verification(struct_processus *s_etat_processus)	debug_memoire_verification()
{	{
# ifdef __BACKTRACE	# ifdef __BACKTRACE
char **appels;	char **appels;
# endif

int j;	int j;
	# endif

integer8 i;	integer8 i;

struct_memoire *element_courant;	struct_memoire *element_courant;
struct_memoire *element_suivant;	struct_memoire *element_suivant;

fprintf(stderr, "[%d-%llu] MEMORY LEAK\n",	fprintf(stderr, "[%d-%llu] LIST OF MEMORY LEAKS\n",
getpid(), (unsigned long long) pthread_self());	getpid(), (unsigned long long) pthread_self());

pthread_mutex_lock(&mutex_allocation);	pthread_mutex_lock(&mutex_allocation);
Line 3764 debug_memoire_verification(struct_proces	Line 3781 debug_memoire_verification(struct_proces

while(element_courant != NULL)	while(element_courant != NULL)
{	{
if (((*element_courant).pid == getpid()) &&	fprintf(stderr, "[%d-%llu] MEDITATION %lld (%llu)\n", getpid(),
(pthread_equal((*element_courant).thread, pthread_self()) != 0))	(unsigned long long) pthread_self(), i,
{	(*element_courant).ordre);
fprintf(stderr, "[%d-%llu] MEDITATION %lld (%llu)\n", getpid(),	fprintf(stderr, "[%d-%llu] P: %p, F: %s(), L: %lu, S: %d\n",
(unsigned long long) pthread_self(), i,	getpid(), (unsigned long long) pthread_self(),
(*element_courant).ordre);	(*element_courant).pointeur,
fprintf(stderr, "[%d-%llu] P: %p, F: %s(), L: %lu, S: %d\n",	(element_courant).fonction, (element_courant).ligne,
getpid(), (unsigned long long) pthread_self(),	(int) (*element_courant).taille);
(*element_courant).pointeur,	fprintf(stderr, "[%d-%llu] A: %s\n", getpid(),
(element_courant).fonction, (element_courant).ligne,	(unsigned long long) pthread_self(),
(int) (*element_courant).taille);	(*element_courant).argument);
fprintf(stderr, "[%d-%llu] A: %s\n", getpid(),
(unsigned long long) pthread_self(),
(*element_courant).argument);

# ifdef __BACKTRACE	# ifdef __BACKTRACE
appels = backtrace_symbols((*element_courant).pile,	appels = backtrace_symbols((*element_courant).pile,
(*element_courant).profondeur);	(*element_courant).profondeur);

fprintf(stderr, "[%d-%llu] BACKTRACE\n",	fprintf(stderr, "[%d-%llu] BACKTRACE\n",
getpid(), (unsigned long long) pthread_self());	getpid(), (unsigned long long) pthread_self());

if (appels != NULL)	if (appels != NULL)
	{
	for(j = 0; j < (*element_courant).profondeur; j++)
{	{
for(j = 0; j < (*element_courant).profondeur; j++)	fprintf(stderr, "[%d-%llu] %s\n", getpid(),
{	(unsigned long long) pthread_self(), appels[j]);
fprintf(stderr, "[%d-%llu] %s\n", getpid(),
(unsigned long long) pthread_self(), appels[j]);
}

free(appels);
}	}
# endif

fprintf(stderr, "\n");

i++;	free(appels);
}	}
	# endif

	fprintf(stderr, "\n");

	i++;

element_suivant = (*element_courant).suivant;	element_suivant = (*element_courant).suivant;

	# ifndef CORE_DUMP
free((*element_courant).fonction);	free((*element_courant).fonction);
free((*element_courant).argument);	free((*element_courant).argument);
free(element_courant);	free(element_courant);
	# endif

element_courant = element_suivant;	element_courant = element_suivant;
}	}

Line 3817 debug_memoire_verification(struct_proces	Line 3834 debug_memoire_verification(struct_proces

return;	return;
}	}

	void
	analyse_post_mortem()
	{
	# ifdef CORE_DUMP
	BUG(debug != NULL, uprintf("[%d-%llu] CREATE CORE DUMP FILE FOR "
	"POST MORTEM ANALYZE\n", getpid(),
	(unsigned long long) pthread_self()));
	# endif

	return;
	}

#endif	#endif

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.16
changed lines
	Added in v.1.17