rpl/src/instructions_r6.c - diff

Return to instructions_r6.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r6.c between versions 1.30 and 1.31

version 1.30, 2011/08/09 11:31:34	version 1.31, 2011/09/14 17:55:59
Line 265 instruction_recv(struct_processus *s_eta	Line 265 instruction_recv(struct_processus *s_eta
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
# endif

if ((s_objet_resultat = lecture_pipe(s_etat_processus,	if ((s_objet_resultat = lecture_pipe(s_etat_processus,
((((struct_processus_fils ) (s_objet_argument).objet))	((((struct_processus_fils ) (s_objet_argument).objet))
.thread).pipe_objets[0])) == NULL)	.thread).pipe_objets[0])) == NULL)
{	{
# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

if (registre_stop == 0)	if (registre_stop == 0)
Line 317 instruction_recv(struct_processus *s_eta	Line 302 instruction_recv(struct_processus *s_eta
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

if (pthread_mutex_lock(&(((((struct_processus_fils *)	if (pthread_mutex_lock(&(((((struct_processus_fils *)
Line 375 instruction_recv(struct_processus *s_eta	Line 353 instruction_recv(struct_processus *s_eta
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 397 instruction_recv(struct_processus *s_eta	Line 371 instruction_recv(struct_processus *s_eta
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.30
changed lines
	Added in v.1.31