rpl/src/instructions_c2.c - diff

Return to instructions_c2.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_c2.c between versions 1.40 and 1.41

version 1.40, 2012/10/01 11:05:03	version 1.41, 2012/12/13 16:59:41
Line 437 instruction_con(struct_processus *s_etat	Line 437 instruction_con(struct_processus *s_etat
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

logical1 argument_nom;	logical1 argument_nom;
	logical1 variable_partagee;

unsigned long i;	unsigned long i;
unsigned long j;	unsigned long j;
Line 554 instruction_con(struct_processus *s_etat	Line 555 instruction_con(struct_processus *s_etat
{	{
// Variable partagée	// Variable partagée

if (pthread_mutex_lock(&(((s_etat_processus)	variable_partagee = d_vrai;
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (recherche_variable_partagee(s_etat_processus,	if (recherche_variable_partagee(s_etat_processus,
((s_etat_processus).pointeur_variable_courante).nom,	((s_etat_processus).pointeur_variable_courante).nom,
Line 572 instruction_con(struct_processus *s_etat	Line 568 instruction_con(struct_processus *s_etat
(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
d_ex_variable_non_definie;	d_ex_variable_non_definie;

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

liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);

return;	return;
}	}

s_objet_2 = ((s_etat_processus).s_liste_variables_partagees)	s_objet_2 = ((s_etat_processus)
.table[((s_etat_processus).s_liste_variables_partagees)	.pointeur_variable_partagee_courante).objet;
.position_variable].objet;

if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}
else	else
{	{
// Variable privée	// Variable privée

s_objet_2 = ((s_etat_processus).pointeur_variable_courante).objet;	s_objet_2 = ((s_etat_processus).pointeur_variable_courante).objet;
	variable_partagee = d_faux;
}	}
}	}
else	else
Line 633 instruction_con(struct_processus *s_etat	Line 615 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

(*s_etat_processus).erreur_execution = d_ex_dimensions_invalides;	(*s_etat_processus).erreur_execution = d_ex_dimensions_invalides;
return;	return;
Line 653 instruction_con(struct_processus *s_etat	Line 647 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex))
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
d_ex_erreur_type_argument;	d_ex_erreur_type_argument;
Line 667 instruction_con(struct_processus *s_etat	Line 674 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex))
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

(*s_etat_processus).erreur_execution = d_ex_argument_invalide;	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;
return;	return;
Line 724 instruction_con(struct_processus *s_etat	Line 744 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);

Line 745 instruction_con(struct_processus *s_etat	Line 777 instruction_con(struct_processus *s_etat
{	{
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
}	}
	else
	{
	if (variable_partagee == d_vrai)
	{
	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	}

liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);

Line 990 instruction_con(struct_processus *s_etat	Line 1034 instruction_con(struct_processus *s_etat
}	}
else	else
{	{
((s_etat_processus).pointeur_variable_courante).objet =	if (variable_partagee == d_vrai)
s_objet_resultat;	{
	((s_etat_processus).pointeur_variable_partagee_courante).objet =
	s_objet_resultat;

	if (pthread_mutex_unlock(&(((s_etat_processus)
	.pointeur_variable_partagee_courante).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}
	else
	{
	((s_etat_processus).pointeur_variable_courante).objet =
	s_objet_resultat;
	}
}	}

return;	return;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.40
changed lines
	Added in v.1.41