rpl/src/instructions_s8.c - diff

Return to instructions_s8.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s8.c between versions 1.34 and 1.38

version 1.34, 2011/09/14 17:55:59	version 1.38, 2011/09/20 14:36:29
Line 247 instruction_send(struct_processus *s_eta	Line 247 instruction_send(struct_processus *s_eta
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 257 instruction_send(struct_processus *s_eta	Line 261 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_objets_attente,	(*s_etat_processus).pipe_nombre_objets_attente,
&pid, sizeof(pid))) != sizeof(pid))	&pid, sizeof(pid))) != sizeof(pid))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 277 instruction_send(struct_processus *s_eta	Line 288 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))	# ifndef SEMAPHORES_NOMMES
!= 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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

pid = getpid();	pid = getpid();
Line 294 instruction_send(struct_processus *s_eta	Line 310 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_objets_attente,	(*s_etat_processus).pipe_nombre_objets_attente,
&pid, sizeof(pid))) != sizeof(pid))	&pid, sizeof(pid))) != sizeof(pid))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 314 instruction_send(struct_processus *s_eta	Line 337 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}
}	}
else	else
Line 344 instruction_send(struct_processus *s_eta	Line 380 instruction_send(struct_processus *s_eta
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 354 instruction_send(struct_processus *s_eta	Line 394 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_objets_attente,	(*s_etat_processus).pipe_nombre_objets_attente,
&tid, sizeof(tid))) != sizeof(tid))	&tid, sizeof(tid))) != sizeof(tid))
{	{
while(pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*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 374 instruction_send(struct_processus *s_eta	Line 418 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

tid = pthread_self();	tid = pthread_self();
Line 390 instruction_send(struct_processus *s_eta	Line 440 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_objets_attente,	(*s_etat_processus).pipe_nombre_objets_attente,
&tid, sizeof(tid))) != sizeof(tid))	&tid, sizeof(tid))) != sizeof(tid))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 410 instruction_send(struct_processus *s_eta	Line 467 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 429 instruction_send(struct_processus *s_eta	Line 496 instruction_send(struct_processus *s_eta
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 438 instruction_send(struct_processus *s_eta	Line 509 instruction_send(struct_processus *s_eta
while(read_atomic(s_etat_processus, (*s_etat_processus).pipe_acquittement,	while(read_atomic(s_etat_processus, (*s_etat_processus).pipe_acquittement,
&tampon, sizeof(unsigned char)) != sizeof(unsigned char))	&tampon, sizeof(unsigned char)) != sizeof(unsigned char))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

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

// Envoi d'un PID invalide (-1) pour ne pas bloquer le thread	// Envoi d'un PID invalide (-1) pour ne pas bloquer le thread
Line 470 instruction_send(struct_processus *s_eta	Line 561 instruction_send(struct_processus *s_eta
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 480 instruction_send(struct_processus *s_eta	Line 575 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_interruptions_attente,	(*s_etat_processus).pipe_nombre_interruptions_attente,
&pid, sizeof(pid))) != sizeof(pid))	&pid, sizeof(pid))) != sizeof(pid))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 500 instruction_send(struct_processus *s_eta	Line 599 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}
}	}

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

	scrutation_interruptions(s_etat_processus);
}	}
else	else
{	{
Line 520 instruction_send(struct_processus *s_eta	Line 632 instruction_send(struct_processus *s_eta
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 530 instruction_send(struct_processus *s_eta	Line 646 instruction_send(struct_processus *s_eta
(*s_etat_processus).pipe_nombre_interruptions_attente,	(*s_etat_processus).pipe_nombre_interruptions_attente,
&tid, sizeof(tid))) != sizeof(tid))	&tid, sizeof(tid))) != sizeof(tid))
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 550 instruction_send(struct_processus *s_eta	Line 673 instruction_send(struct_processus *s_eta
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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;
}	}

	scrutation_interruptions(s_etat_processus);
}	}

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

// ecriture_pipe() ne peut �tre interrompu par un signal.	// ecriture_pipe() ne peut �tre interrompu par un signal.

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	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 575 instruction_send(struct_processus *s_eta	Line 715 instruction_send(struct_processus *s_eta
if (ecriture_pipe(s_etat_processus, (*s_etat_processus).pipe_donnees,	if (ecriture_pipe(s_etat_processus, (*s_etat_processus).pipe_donnees,
s_objet) == d_erreur)	s_objet) == d_erreur)
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
Line 590 instruction_send(struct_processus *s_eta	Line 737 instruction_send(struct_processus *s_eta
return;	return;
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
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.34
changed lines
	Added in v.1.38