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.44 and 1.51

version 1.44, 2012/10/07 08:18:36	version 1.51, 2013/02/26 19:56:14
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.11	RPL/2 (R) version 4.1.12
Copyright (C) 1989-2012 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

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

Line 513 instruction_fleche(struct_processus *s_e	Line 513 instruction_fleche(struct_processus *s_e
if ((*s_etat_processus).evaluation_expression_compilee	if ((*s_etat_processus).evaluation_expression_compilee
== 'Y')	== 'Y')
{	{
printf("Ici\n");
s_variable_statique.niveau = 0;	s_variable_statique.niveau = 0;
}	}
else	else
{	{
printf("Là\n");
s_variable_statique.niveau =	s_variable_statique.niveau =
(*s_etat_processus).niveau_courant;	(*s_etat_processus).niveau_courant;
}	}
Line 551 printf("Là\n");	Line 549 printf("Là\n");
(*s_etat_processus).objet_courant;	(*s_etat_processus).objet_courant;
}	}

if (pthread_mutex_lock(&(((s_etat_processus)	if (pthread_mutex_lock(&mutex_creation_variable_partagee) != 0)
.s_liste_variables_partagees).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 561 printf("Là\n");	Line 558 printf("Là\n");
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')
? 'P' : 'E') == d_vrai)	? 'P' : 'E') != NULL)
{	{
// 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)
.s_liste_variables_partagees).mutex)) != 0)	.pointeur_variable_partagee_courante).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 589 printf("Là\n");	Line 593 printf("Là\n");
}	}
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 598 printf("Là\n");	Line 601 printf("Là\n");
+ 1) * sizeof(unsigned char))) == NULL)	+ 1) * sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.pointeur_variable_partagee_courante).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 650 printf("Là\n");	Line 653 printf("Là\n");
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)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

return;	return;
}	}

if (pthread_mutex_unlock(&(((s_etat_processus)	s_variable.objet = NULL;
.s_liste_variables_partagees).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.44
changed lines
	Added in v.1.51