rpl/src/instructions_d5.c - diff

Return to instructions_d5.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_d5.c between versions 1.81 and 1.90

version 1.81, 2011/11/18 21:31:40	version 1.90, 2012/08/22 10:47:15
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.4	RPL/2 (R) version 4.1.10
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 1367 instruction_detach(struct_processus *s_e	Line 1367 instruction_detach(struct_processus *s_e
l_element_courant = (*s_etat_processus).liste_mutexes;	l_element_courant = (*s_etat_processus).liste_mutexes;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
pthread_mutex_trylock(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));
pthread_mutex_unlock(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));
pthread_mutex_destroy(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));

liberation(s_etat_processus, (*l_element_courant).donnee);	liberation(s_etat_processus, (*l_element_courant).donnee);
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;
free(l_element_courant);	free(l_element_courant);
Line 1961 instruction_detach(struct_processus *s_e	Line 1954 instruction_detach(struct_processus *s_e

if ((s = malloc(sizeof(struct_objet *))) == NULL)	if ((s = malloc(sizeof(struct_objet *))) == NULL)
{	{
(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution = d_es_allocation_memoire;
d_es_allocation_memoire;
return;	return;
}	}

Line 2041 instruction_detach(struct_processus *s_e	Line 2033 instruction_detach(struct_processus *s_e
l_element_courant = (*s_etat_processus).liste_mutexes;	l_element_courant = (*s_etat_processus).liste_mutexes;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
pthread_mutex_trylock(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));
pthread_mutex_unlock(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));
pthread_mutex_destroy(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));

liberation(s_etat_processus, (*l_element_courant).donnee);	liberation(s_etat_processus, (*l_element_courant).donnee);
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;
free(l_element_courant);	free(l_element_courant);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.81
changed lines
	Added in v.1.90