rpl/src/instructions_f1.c - diff

Return to instructions_f1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_f1.c between versions 1.47 and 1.48

version 1.47, 2012/12/17 21:22:43	version 1.48, 2012/12/18 10:20:24
Line 549 instruction_fleche(struct_processus *s_e	Line 549 instruction_fleche(struct_processus *s_e
(*s_etat_processus).objet_courant;	(*s_etat_processus).objet_courant;
}	}

	if (pthread_mutex_lock(&mutex_creation_variable_partagee) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if (recherche_variable_partagee(s_etat_processus, s_variable.nom,	if (recherche_variable_partagee(s_etat_processus, s_variable.nom,
position_variable,	position_variable,
((*s_etat_processus).mode_execution_programme == 'Y')	((*s_etat_processus).mode_execution_programme == 'Y')
Line 556 instruction_fleche(struct_processus *s_e	Line 562 instruction_fleche(struct_processus *s_e
{	{
// Variable partagée à utiliser	// Variable partagée à utiliser

	if (pthread_mutex_unlock(&mutex_creation_variable_partagee)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.pointeur_variable_partagee_courante).mutex)) != 0)	.pointeur_variable_partagee_courante).mutex)) != 0)
{	{
Line 580 instruction_fleche(struct_processus *s_e	Line 593 instruction_fleche(struct_processus *s_e
}	}
else	else
{	{
// Variable partagée à utiliser
// Variable partagee à créer	// Variable partagee à créer

(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
Line 641 instruction_fleche(struct_processus *s_e	Line 653 instruction_fleche(struct_processus *s_e
if (creation_variable_partagee(s_etat_processus,	if (creation_variable_partagee(s_etat_processus,
&s_variable_partagee) == d_erreur)	&s_variable_partagee) == d_erreur)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)
.pointeur_variable_partagee_courante).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

return;	return;
}	}

if (pthread_mutex_unlock(&(((s_etat_processus)	s_variable.objet = NULL;
.pointeur_variable_partagee_courante).mutex)) != 0)
	if (pthread_mutex_unlock(&mutex_creation_variable_partagee)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}

s_variable.objet = NULL;
}	}
}	}
else	else

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.47
changed lines
	Added in v.1.48