rpl/src/instructions_s10.c - diff

Return to instructions_s10.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s10.c between versions 1.51 and 1.62

version 1.51, 2011/11/26 10:01:31	version 1.62, 2012/10/01 11:05:06
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.5	RPL/2 (R) version 4.1.11
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 45 instruction_spawn(struct_processus *s_et	Line 45 instruction_spawn(struct_processus *s_et

pthread_mutexattr_t attributs_mutex;	pthread_mutexattr_t attributs_mutex;

pthread_t thread_id;
pthread_t thread_surveillance;	pthread_t thread_surveillance;

struct_descripteur_thread *s_argument_thread;	struct_descripteur_thread *s_argument_thread;
Line 415 instruction_spawn(struct_processus *s_et	Line 414 instruction_spawn(struct_processus *s_et

(*s_argument_thread).thread_actif = d_faux;	(*s_argument_thread).thread_actif = d_faux;

if (pthread_create(&thread_id, &attributs, lancement_thread,	if (pthread_create(&(*s_nouvel_etat_processus).tid,
s_argument_thread) != 0)	&attributs, lancement_thread, s_argument_thread) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 707 instruction_sqlconnect(struct_processus	Line 706 instruction_sqlconnect(struct_processus
if ((s_objet_resultat = parametres_sql(s_etat_processus,	if ((s_objet_resultat = parametres_sql(s_etat_processus,
s_objet_argument)) == NULL)	s_objet_argument)) == NULL)
{	{
	liberation(s_etat_processus, s_objet_resultat);
liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
return;	return;
}	}

	if ((*s_etat_processus).erreur_execution ==
	d_ex_instruction_indisponible)
	{
	liberation(s_etat_processus, s_objet_resultat);
	return;
	}

if ((s_objet_systeme = copie_objet(s_etat_processus, s_objet_resultat,	if ((s_objet_systeme = copie_objet(s_etat_processus, s_objet_resultat,
'O')) == NULL)	'O')) == NULL)
{	{
Line 1194 instruction_smphrdecr(struct_processus *	Line 1201 instruction_smphrdecr(struct_processus *
void	void
instruction_smphrtrydecr(struct_processus *s_etat_processus)	instruction_smphrtrydecr(struct_processus *s_etat_processus)
{	{
struct_objet *s_objet_argument;	real8 partie_entiere;

	struct_objet *s_objet_argument_1;
	struct_objet *s_objet_argument_2;
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

	struct timeval horodatage;

	struct timespec horodatage_absolu;

unsigned char *tampon;	unsigned char *tampon;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
Line 1214 instruction_smphrtrydecr(struct_processu	Line 1228 instruction_smphrtrydecr(struct_processu
printf("(try to decremente semaphore)\n\n");	printf("(try to decremente semaphore)\n\n");
}	}

printf(" 1: %s\n", d_SPH);	printf(" 2: %s\n", d_SPH);
	printf(" 1: %s, %s\n", d_INT, d_REL);
printf("-> 1: %s\n", d_INT);	printf("-> 1: %s\n", d_INT);
return;	return;
}	}
Line 1226 instruction_smphrtrydecr(struct_processu	Line 1241 instruction_smphrtrydecr(struct_processu

if (test_cfsf(s_etat_processus, 31) == d_vrai)	if (test_cfsf(s_etat_processus, 31) == d_vrai)
{	{
if (empilement_pile_last(s_etat_processus, 1) == d_erreur)	if (empilement_pile_last(s_etat_processus, 2) == d_erreur)
{	{
return;	return;
}	}
}	}

if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),	if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),
&s_objet_argument) == d_erreur)	&s_objet_argument_1) == d_erreur)
{	{
(*s_etat_processus).erreur_execution = d_ex_manque_argument;	(*s_etat_processus).erreur_execution = d_ex_manque_argument;
return;	return;
}	}

if ((*s_objet_argument).type == SPH)	if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),
	&s_objet_argument_2) == d_erreur)
{	{
	(*s_etat_processus).erreur_execution = d_ex_manque_argument;
	return;
	}

	if (((s_objet_argument_2).type == SPH) && (((s_objet_argument_1).type
	== INT) \|\| ((*s_objet_argument_1).type == REL)))
	{
	gettimeofday(&horodatage, NULL);

	if ((*s_objet_argument_1).type == INT)
	{
	if ((((integer8 ) (*s_objet_argument_1).objet)) < 0)
	{
	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	return;
	}

	horodatage.tv_sec += (((integer8 ) (*s_objet_argument_1).objet));
	}
	else
	{
	if ((((real8 ) (*s_objet_argument_1).objet)) < 0)
	{
	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	return;
	}

	partie_entiere = floor((((real8 ) (*s_objet_argument_1).objet)));
	horodatage.tv_sec += partie_entiere;
	horodatage.tv_usec += ((suseconds_t) ((((real8 )
	(s_objet_argument_1).objet)) - partie_entiere)) 1000000;

	if (horodatage.tv_usec > 1000000)
	{
	horodatage.tv_usec -= 1000000;
	horodatage.tv_sec += 1;
	}
	}

	horodatage_absolu.tv_sec = horodatage.tv_sec;
	horodatage_absolu.tv_nsec = horodatage.tv_usec * 1000;

if ((s_objet_resultat = allocation(s_etat_processus, INT)) == NULL)	if ((s_objet_resultat = allocation(s_etat_processus, INT)) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 1249 instruction_smphrtrydecr(struct_processu	Line 1313 instruction_smphrtrydecr(struct_processu

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
if ((tampon = formateur(s_etat_processus, 0, s_objet_argument))	if ((tampon = formateur(s_etat_processus, 0, s_objet_argument_2))
== NULL)	== NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 1280 instruction_smphrtrydecr(struct_processu	Line 1344 instruction_smphrtrydecr(struct_processu
return;	return;
}	}

(((integer8 ) (*s_objet_resultat).objet)) = 0;	(((integer8 ) (*s_objet_resultat).objet)) = -1;

while(sem_trywait((((struct_semaphore ) (*s_objet_argument).objet))	while(sem_timedwait((((struct_semaphore ) (*s_objet_argument_2)
.semaphore) == -1)	.objet)).semaphore, &horodatage_absolu) == -1)
{	{
switch(errno)	switch(errno)
{	{
Line 1301 instruction_smphrtrydecr(struct_processu	Line 1365 instruction_smphrtrydecr(struct_processu
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
return;	return;
}	}

case EAGAIN :	case ETIMEDOUT :
{	{
(((integer8 ) (*s_objet_resultat).objet)) = -1;	(((integer8 ) (*s_objet_resultat).objet)) = 0;
break;	break;
}	}
}	}

if ((((integer8 ) (*s_objet_resultat).objet)) != 0)	if ((((integer8 ) (*s_objet_resultat).objet)) == 0)
{	{
break;	break;
}	}
Line 1341 instruction_smphrtrydecr(struct_processu	Line 1406 instruction_smphrtrydecr(struct_processu
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
}	}
else	else
{	{
(*s_etat_processus).erreur_execution = d_ex_erreur_type_argument;	(*s_etat_processus).erreur_execution = d_ex_erreur_type_argument;

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
return;	return;
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.51
changed lines
	Added in v.1.62