rpl/src/instructions_r4.c - diff

Return to instructions_r4.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r4.c between versions 1.28.2.3 and 1.42

version 1.28.2.3, 2011/04/17 14:01:23	version 1.42, 2011/09/20 08:56:23
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.23	RPL/2 (R) version 4.1.3
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2011 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 2034 instruction_read(struct_processus *s_eta	Line 2034 instruction_read(struct_processus *s_eta
}	}
}	}

printf("<1>\n");
if ((((struct_socket ) (*s_objet_argument_1).objet)).binaire == 'N')	if ((((struct_socket ) (*s_objet_argument_1).objet)).binaire == 'N')
{ // Socket formatée	{ // Socket formatée
longueur_questure = 256;	longueur_questure = 256;
printf("<2>\n");

do	do
{	{
Line 2050 printf("<2>\n");	Line 2048 printf("<2>\n");
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

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;
Line 2099 printf("<2>\n");	Line 2089 printf("<2>\n");
tampon_lecture, longueur_questure,	tampon_lecture, longueur_questure,
MSG_PEEK \| MSG_DONTWAIT, (struct sockaddr *)	MSG_PEEK \| MSG_DONTWAIT, (struct sockaddr *)
&adresse_ipv6, &longueur_adresse);	&adresse_ipv6, &longueur_adresse);

# else	# else
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
Line 2117 printf("<2>\n");	Line 2108 printf("<2>\n");
free(tampon_lecture);	free(tampon_lecture);
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus, s_objet_argument_1);

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

(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
Line 2138 printf("<2>\n");	Line 2120 printf("<2>\n");
return;	return;
}	}

if (longueur_effective <= 0)	if (longueur_effective < 0)
{	{
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);
}	}

	// Une donnée a été reçue.

if (((*s_etat_processus).var_volatile_requete_arret == -1)	if (((*s_etat_processus).var_volatile_requete_arret == -1)
\|\| (longueur_effective > 0))	\|\| (longueur_effective >= 0))
{	{
break;	break;
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (sem_wait(&((*s_etat_processus).semaphore_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).var_volatile_requete_arret == -1)	if ((*s_etat_processus).var_volatile_requete_arret == -1)
Line 2358 printf("<2>\n");	Line 2335 printf("<2>\n");
(*s_objet_argument_1).objet)).socket, tampon_lecture,	(*s_objet_argument_1).objet)).socket, tampon_lecture,
longueur_effective, MSG_DONTWAIT,	longueur_effective, MSG_DONTWAIT,
NULL, &longueur_adresse);	NULL, &longueur_adresse);
printf("<%s>\n", tampon_lecture);

(*s_objet_adresse).objet = NULL;	(*s_objet_adresse).objet = NULL;
}	}
Line 2559 printf("<%s>\n", tampon_lecture);	Line 2535 printf("<%s>\n", tampon_lecture);
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

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;
Line 2626 printf("<%s>\n", tampon_lecture);	Line 2594 printf("<%s>\n", tampon_lecture);
free(tampon_lecture);	free(tampon_lecture);
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus, s_objet_argument_1);

# ifndef SEMAPHORES_NOMMES	if (sem_wait(&((*s_etat_processus)
while(sem_wait(&((*s_etat_processus)	.semaphore_fork)) != 0)
.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;
(*s_etat_processus).erreur_systeme =	return;
d_es_processus;
return;
}
}	}

(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
Line 2661 printf("<%s>\n", tampon_lecture);	Line 2621 printf("<%s>\n", tampon_lecture);
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (sem_wait(&((*s_etat_processus).semaphore_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).var_volatile_requete_arret == -1)	if ((*s_etat_processus).var_volatile_requete_arret == -1)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.28.2.3
changed lines
	Added in v.1.42