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.11 and 1.12

version 1.11, 2010/04/07 13:45:09	version 1.12, 2010/04/17 18:57:36
Line 262 instruction_wait(struct_processus *s_eta	Line 262 instruction_wait(struct_processus *s_eta

do	do
{	{
	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

code_retour = nanosleep(&temporisation, &temporisation);	code_retour = nanosleep(&temporisation, &temporisation);
erreur = errno;	erreur = errno;

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1364 instruction_write(struct_processus *s_et	Line 1376 instruction_write(struct_processus *s_et
return;	return;
}	}

if (sem_post(&((*s_etat_processus).semaphore_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
{	{
if (sigaction(SIGPIPE, &registre, NULL) != 0)	if (sigaction(SIGPIPE, &registre, NULL) != 0)
{	{
Line 1388 instruction_write(struct_processus *s_et	Line 1403 instruction_write(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1408 instruction_write(struct_processus *s_et	Line 1427 instruction_write(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1460 instruction_write(struct_processus *s_et	Line 1483 instruction_write(struct_processus *s_et
108);	108);
adresse_unix.sun_path[108 - 1] = d_code_fin_chaine;	adresse_unix.sun_path[108 - 1] = d_code_fin_chaine;

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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 (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
strlen(chaine), 0, (struct sockaddr *)	strlen(chaine), 0, (struct sockaddr *)
&adresse_unix, sizeof(adresse_unix)) < 0)	&adresse_unix, sizeof(adresse_unix)) < 0)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1487 instruction_write(struct_processus *s_et	Line 1523 instruction_write(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1514 instruction_write(struct_processus *s_et	Line 1554 instruction_write(struct_processus *s_et
adresse_ipv4.sin_port = htons(port);	adresse_ipv4.sin_port = htons(port);
adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);	adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus)	if (sem_post(&((*s_etat_processus)
.semaphore_fork)) != 0)	.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 (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
strlen(chaine), 0, (struct sockaddr *)	strlen(chaine), 0, (struct sockaddr *)
&adresse_ipv4, sizeof(adresse_ipv4)) < 0)	&adresse_ipv4, sizeof(adresse_ipv4)) < 0)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1542 instruction_write(struct_processus *s_et	Line 1595 instruction_write(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1584 instruction_write(struct_processus *s_et	Line 1642 instruction_write(struct_processus *s_et
adresse_ipv6.sin6_addr.s6_addr[i] =	adresse_ipv6.sin6_addr.s6_addr[i] =
adresse[i], i++);	adresse[i], i++);

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus)	if (sem_post(&((*s_etat_processus)
.semaphore_fork)) != 0)	.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 (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
strlen(chaine), 0, (struct sockaddr *)	strlen(chaine), 0, (struct sockaddr *)
&adresse_ipv6, sizeof(adresse_ipv6)) < 0)	&adresse_ipv6, sizeof(adresse_ipv6)) < 0)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1612 instruction_write(struct_processus *s_et	Line 1683 instruction_write(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 1819 instruction_wflock(struct_processus *s_e	Line 1895 instruction_wflock(struct_processus *s_e
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2134 instruction_wfproc(struct_processus *s_e	Line 2222 instruction_wfproc(struct_processus *s_e
registre_instruction_valide;	registre_instruction_valide;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2393 instruction_wfdata(struct_processus *s_e	Line 2493 instruction_wfdata(struct_processus *s_e
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2585 instruction_wfsock(struct_processus *s_e	Line 2697 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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 (((((struct_socket ) (*s_objet_resultat).objet)).socket =	if (((((struct_socket ) (*s_objet_resultat).objet)).socket =
accept((((struct_socket ) (*s_objet_argument).objet))	accept((((struct_socket ) (*s_objet_argument).objet))
Line 2598 instruction_wfsock(struct_processus *s_e	Line 2718 instruction_wfsock(struct_processus *s_e
{	{
erreur = errno;	erreur = errno;

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2630 instruction_wfsock(struct_processus *s_e	Line 2754 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2667 instruction_wfsock(struct_processus *s_e	Line 2795 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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 (((((struct_socket ) (*s_objet_resultat).objet)).socket =	if (((((struct_socket ) (*s_objet_resultat).objet)).socket =
accept((((struct_socket ) (*s_objet_argument).objet))	accept((((struct_socket ) (*s_objet_argument).objet))
Line 2680 instruction_wfsock(struct_processus *s_e	Line 2816 instruction_wfsock(struct_processus *s_e
{	{
erreur = errno;	erreur = errno;

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2712 instruction_wfsock(struct_processus *s_e	Line 2852 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2757 instruction_wfsock(struct_processus *s_e	Line 2901 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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 (((((struct_socket ) (*s_objet_resultat).objet)).socket =	if (((((struct_socket ) (*s_objet_resultat).objet)).socket =
accept((((struct_socket ) (*s_objet_argument).objet))	accept((((struct_socket ) (*s_objet_argument).objet))
Line 2769 instruction_wfsock(struct_processus *s_e	Line 2921 instruction_wfsock(struct_processus *s_e
{	{
erreur = errno;	erreur = errno;

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 2801 instruction_wfsock(struct_processus *s_e	Line 2957 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3087 instruction_wfpoke(struct_processus *s_e	Line 3247 instruction_wfpoke(struct_processus *s_e

do	do
{	{
	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3237 instruction_wfack(struct_processus *s_et	Line 3409 instruction_wfack(struct_processus *s_et
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_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

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

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.11
changed lines
	Added in v.1.12