rpl/src/instructions_w1.c - diff

Return to instructions_w1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_w1.c between versions 1.83 and 1.84

version 1.83, 2013/05/23 12:45:08	version 1.84, 2013/05/28 22:09:55
Line 289 instruction_wait(struct_processus *s_eta	Line 289 instruction_wait(struct_processus *s_eta

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 300 instruction_wait(struct_processus *s_eta	Line 301 instruction_wait(struct_processus *s_eta
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2291 instruction_wflock(struct_processus *s_e	Line 2293 instruction_wflock(struct_processus *s_e
}	}
else	else
{	{
if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2302 instruction_wflock(struct_processus *s_e	Line 2305 instruction_wflock(struct_processus *s_e
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_unlock(&(*s_etat_processus)
	.mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2567 instruction_wfproc(struct_processus *s_e	Line 2571 instruction_wfproc(struct_processus *s_e
* Le processus n'est pas terminé	* Le processus n'est pas terminé
*/	*/

	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_interruptions)) != 0)
	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex));

	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees	if ((*s_etat_processus).nombre_interruptions_non_affectees
!= 0)	!= 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_interruptions)) != 0)
	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex));

	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
Line 2893 instruction_wfdata(struct_processus *s_e	Line 2927 instruction_wfdata(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus)
	.mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2905 instruction_wfdata(struct_processus *s_e	Line 2940 instruction_wfdata(struct_processus *s_e
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_unlock(&(*s_etat_processus)
	.mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3641 instruction_wfswi(struct_processus *s_et	Line 3677 instruction_wfswi(struct_processus *s_et
return;	return;
}	}

if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3652 instruction_wfswi(struct_processus *s_et	Line 3689 instruction_wfswi(struct_processus *s_et
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3790 instruction_wfpoke(struct_processus *s_e	Line 3828 instruction_wfpoke(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3801 instruction_wfpoke(struct_processus *s_e	Line 3839 instruction_wfpoke(struct_processus *s_e
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3909 instruction_wfack(struct_processus *s_et	Line 3947 instruction_wfack(struct_processus *s_et
{	{
scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3920 instruction_wfack(struct_processus *s_et	Line 3958 instruction_wfack(struct_processus *s_et
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

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

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.83
changed lines
	Added in v.1.84