rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.129 and 1.139

version 1.129, 2012/12/18 13:19:39	version 1.139, 2013/03/27 09:14:51
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.12	RPL/2 (R) version 4.1.13
Copyright (C) 1989-2012 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

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

Line 51 rplinit(int argc, char argv[], char en	Line 51 rplinit(int argc, char argv[], char en
int erreur_historique;	int erreur_historique;
int option_P;	int option_P;

	integer8 i;

logical1 core;	logical1 core;
logical1 debug;	logical1 debug;
logical1 erreur_fichier;	logical1 erreur_fichier;
Line 106 rplinit(int argc, char argv[], char en	Line 108 rplinit(int argc, char argv[], char en
unsigned char *ptr;	unsigned char *ptr;
unsigned char *tampon;	unsigned char *tampon;

unsigned long i;
unsigned long unite_fichier;	unsigned long unite_fichier;

void *l_element_courant;	void *l_element_courant;
Line 219 rplinit(int argc, char argv[], char en	Line 220 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if ((arg_exec = malloc((argc + 1) * sizeof(char *))) == NULL)	if ((arg_exec = malloc((((size_t) argc) + 1) * sizeof(char *))) == NULL)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&semaphore_gestionnaires_signaux);	sem_post(&semaphore_gestionnaires_signaux);
Line 241 rplinit(int argc, char argv[], char en	Line 242 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

for(i = 0; i < (unsigned long) argc; i++)	for(i = 0; i < argc; i++)
{	{
arg_exec[i] = argv[i];	arg_exec[i] = argv[i];
}	}
Line 435 rplinit(int argc, char argv[], char en	Line 436 rplinit(int argc, char argv[], char en

if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("+++Copyright (C) 1989 à 2011, 2012 BERTRAND Joël\n");	printf("+++Copyright (C) 1989 à 2012, 2013 BERTRAND Joël\n");
}	}
else	else
{	{
printf("+++Copyright (C) 1989 to 2011, 2012 BERTRAND Joel\n");	printf("+++Copyright (C) 1989 to 2012, 2013 BERTRAND Joel\n");
}	}

if (getenv("HOME") != NULL)	if (getenv("HOME") != NULL)
Line 593 rplinit(int argc, char argv[], char en	Line 594 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGINT);	raise(SIGINT);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 680 rplinit(int argc, char argv[], char en	Line 681 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGTERM);	raise(SIGTERM);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 767 rplinit(int argc, char argv[], char en	Line 768 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGALRM);	raise(SIGALRM);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 855 rplinit(int argc, char argv[], char en	Line 856 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGTSTP);	raise(SIGTSTP);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 945 rplinit(int argc, char argv[], char en	Line 946 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGPIPE);	raise(SIGPIPE);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 1035 rplinit(int argc, char argv[], char en	Line 1036 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGUSR1);	raise(SIGUSR1);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 2253 rplinit(int argc, char argv[], char en	Line 2254 rplinit(int argc, char argv[], char en
}	}

(*s_etat_processus).longueur_definitions_chainees =	(*s_etat_processus).longueur_definitions_chainees =
strlen((*s_etat_processus)	(integer8) strlen((*s_etat_processus)
.definitions_chainees);	.definitions_chainees);

break;	break;
Line 2800 rplinit(int argc, char argv[], char en	Line 2801 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGSEGV);	raise(SIGSEGV);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 2900 rplinit(int argc, char argv[], char en	Line 2901 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
kill(getpid(), SIGBUS);	raise(SIGBUS);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 4482 rplinit(int argc, char argv[], char en	Line 4483 rplinit(int argc, char argv[], char en
{	{
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
encart(s_etat_processus,	encart(s_etat_processus,
(unsigned long) (5 * 1000000));	(integer8) (5 * 1000000));

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
{	{
Line 5138 rplinit(int argc, char argv[], char en	Line 5139 rplinit(int argc, char argv[], char en

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme	if (((*s_etat_processus)
== 0) && ((*s_etat_processus)
.arret_depuis_abort == 0) &&	.arret_depuis_abort == 0) &&
((*s_etat_processus).at_exit	((*s_etat_processus).at_exit
!= NULL))	!= NULL))
{	{
	// Permet de traiter ATEXIT
	// même après réception d'un SIGINT.
	(*s_etat_processus)
	.var_volatile_alarme = 0;
	(*s_etat_processus)
	.var_volatile_requete_arret = 0;

	if ((*s_etat_processus).profilage ==
	d_vrai)
	{
	profilage(s_etat_processus,
	"ATEXIT");
	}

erreur = evaluation(s_etat_processus,	erreur = evaluation(s_etat_processus,
(*s_etat_processus).at_exit,	(*s_etat_processus).at_exit,
'E');	'E');

	if ((*s_etat_processus).profilage ==
	d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	if (((*s_etat_processus)
	.erreur_execution != d_ex) \|\|
	((*s_etat_processus).exception
	!= d_ep) \|\| ((*s_etat_processus)
	.erreur_systeme != d_es))
	{
	printf("%s [%d]\n", message =
	messages(s_etat_processus),
	(int) getpid());
	free(message);

	if (test_cfsf(s_etat_processus, 51)
	== d_faux)
	{
	printf("%s", ds_beep);
	}

	if ((*s_etat_processus).core ==
	d_vrai)
	{
	printf("\n");

	if ((*s_etat_processus).langue
	== 'F')
	{
	printf("+++Information : Gé"
	"nération du fichie"
	"r rpl-core "
	"[%d]\n", (int)
	getpid());
	}
	else
	{
	printf("+++Information : Wr"
	"iting rpl-core fil"
	"e [%d]\n",
	(int) getpid());
	}

	rplcore(s_etat_processus);

	if ((*s_etat_processus).langue
	== 'F')
	{
	printf("+++Information : Pr"
	"ocessus tracé [%d]"
	"\n",
	(int) getpid());
	}
	else
	{
	printf("+++Information : Do"
	"ne [%d]\n", (int)
	getpid());
	}

	printf("\n");
	fflush(stdout);
	}
	}
}	}
}	}
}	}
Line 5159 rplinit(int argc, char argv[], char en	Line 5240 rplinit(int argc, char argv[], char en

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme	if (((*s_etat_processus)
== 0) && ((*s_etat_processus)
.arret_depuis_abort == 0) &&	.arret_depuis_abort == 0) &&
((*s_etat_processus).at_exit	((*s_etat_processus).at_exit
!= NULL))	!= NULL))
{	{
	// Permet de traiter ATEXIT
	// même après réception d'un SIGINT.
	(*s_etat_processus)
	.var_volatile_alarme = 0;
	(*s_etat_processus)
	.var_volatile_requete_arret = 0;

	if ((*s_etat_processus).profilage ==
	d_vrai)
	{
	profilage(s_etat_processus,
	"ATEXIT");
	}

erreur = evaluation(s_etat_processus,	erreur = evaluation(s_etat_processus,
(*s_etat_processus).at_exit,	(*s_etat_processus).at_exit,
'E');	'E');

	if ((*s_etat_processus).profilage ==
	d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	if (((*s_etat_processus)
	.erreur_execution != d_ex) \|\|
	((*s_etat_processus).exception
	!= d_ep) \|\| ((*s_etat_processus)
	.erreur_systeme != d_es))
	{
	printf("%s [%d]\n", message =
	messages(s_etat_processus),
	(int) getpid());
	free(message);

	if (test_cfsf(s_etat_processus, 51)
	== d_faux)
	{
	printf("%s", ds_beep);
	}

	if ((*s_etat_processus).core ==
	d_vrai)
	{
	printf("\n");

	if ((*s_etat_processus).langue
	== 'F')
	{
	printf("+++Information : Gé"
	"nération du fichie"
	"r rpl-core "
	"[%d]\n", (int)
	getpid());
	}
	else
	{
	printf("+++Information : Wr"
	"iting rpl-core fil"
	"e [%d]\n",
	(int) getpid());
	}

	rplcore(s_etat_processus);

	if ((*s_etat_processus).langue
	== 'F')
	{
	printf("+++Information : Pr"
	"ocessus tracé [%d]"
	"\n",
	(int) getpid());
	}
	else
	{
	printf("+++Information : Do"
	"ne [%d]\n", (int)
	getpid());
	}

	printf("\n");
	fflush(stdout);
	}
	}
}	}
}	}
}	}
Line 5380 rplinit(int argc, char argv[], char en	Line 5541 rplinit(int argc, char argv[], char en
l_element_courant = (void *)	l_element_courant = (void *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

for(i = 0; i < (unsigned long)	for(i = 0; i < ((((struct_processus_fils *)
((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet)).thread)	l_element_courant)).donnee).objet)).thread)
.nombre_objets_dans_pipe; i++)	.nombre_objets_dans_pipe; i++)
Line 5721 rplinit(int argc, char argv[], char en	Line 5881 rplinit(int argc, char argv[], char en
{	{
free((*resultats));	free((*resultats));

if (((resultats) = malloc(((s_etat_processus)	if (((*resultats) = malloc(((size_t)
.hauteur_pile_operationnelle + 1)	((*s_etat_processus)
	.hauteur_pile_operationnelle + 1))
* sizeof(unsigned char **))) != NULL)	* sizeof(unsigned char **))) != NULL)
{	{
(resultats)[(s_etat_processus)	(resultats)[(s_etat_processus)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.129
changed lines
	Added in v.1.139