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.74 and 1.83

version 1.74, 2011/07/22 07:38:41	version 1.83, 2011/09/14 14:34:28
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.1	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 105 rplinit(int argc, char *argv[], unsigned	Line 105 rplinit(int argc, char *argv[], unsigned
volatile unsigned char traitement_fichier_temporaire;	volatile unsigned char traitement_fichier_temporaire;

errno = 0;	errno = 0;
	pid_processus_pere = getpid();

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
debug_memoire_initialisation();	debug_memoire_initialisation();
Line 182 rplinit(int argc, char *argv[], unsigned	Line 183 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).langue = 'E';	(*s_etat_processus).langue = 'E';
}	}

	initialisation_contexte_cas(s_etat_processus);

(*s_etat_processus).exception = d_ep;	(*s_etat_processus).exception = d_ep;
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
	(*s_etat_processus).compteur_violation_d_acces = 0;
	(*s_etat_processus).tid_courant = pthread_self();

(*s_etat_processus).rpl_home = rpl_home;	(*s_etat_processus).rpl_home = rpl_home;

Line 240 rplinit(int argc, char *argv[], unsigned	Line 245 rplinit(int argc, char *argv[], unsigned
recherche_chemin_fichiers_temporaires(s_etat_processus);	recherche_chemin_fichiers_temporaires(s_etat_processus);

# ifdef IPCS_SYSV	# ifdef IPCS_SYSV
# ifndef OS2	# ifndef OS2
chemin_semaphores_SysV = (*s_etat_processus).chemin_fichiers_temporaires;	chemin_semaphores_SysV =
# endif	(*s_etat_processus).chemin_fichiers_temporaires;
# endif	# endif

# ifdef _BROKEN_SIGINFO
creation_fifos_signaux(s_etat_processus);
# ifdef return
# undef return
# endif
# define return destruction_fifos_signaux(s_etat_processus); return
# endif	# endif

insertion_thread(s_etat_processus, d_vrai);	insertion_thread(s_etat_processus, d_vrai);
	creation_queue_signaux(s_etat_processus);

# ifndef OS2	# ifndef OS2
localisation_courante(s_etat_processus);	localisation_courante(s_etat_processus);
Line 413 rplinit(int argc, char *argv[], unsigned	Line 412 rplinit(int argc, char *argv[], unsigned
}	}
# endif	# endif

# ifndef _BROKEN_SIGINFO
action.sa_sigaction = interruption1;
# else
action.sa_handler = interruption1;	action.sa_handler = interruption1;
# endif	action.sa_flags = SA_ONSTACK;
action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGINT, &action, NULL) != 0)	if (sigaction(SIGINT, &action, NULL) != 0)
{	{
Line 437 rplinit(int argc, char *argv[], unsigned	Line 432 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if (sigaction(SIGTERM, &action, NULL) != 0)	signal_test = SIGTEST;
	kill(getpid(), SIGINT);

	if (signal_test != SIGINT)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 454 rplinit(int argc, char *argv[], unsigned	Line 452 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	if (sigaction(SIGTERM, &action, NULL) != 0)
action.sa_sigaction = interruption2;
# else
action.sa_handler = interruption2;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGTSTP, &action, NULL) != 0)
{
if ((*s_etat_processus).langue == 'F')
{
printf("+++Système : Initialisation des signaux POSIX "
"impossible\n");
}
else
{
printf("+++System : Initialization of POSIX signals failed\n");
}

return(EXIT_FAILURE);
}

# ifndef _BROKEN_SIGINFO
action.sa_sigaction = interruption4;
# else
action.sa_handler = interruption4;
# endif
// SIGCONT ne doit pas pouvoir être appelé depuis son gestionnaire.
action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGSTART, &action, NULL) != 0)
{	{
if ((*s_etat_processus).langue == 'F')	erreur = d_es_signal;
{
printf("+++Système : Initialisation des signaux POSIX "
"impossible\n");
}
else
{
printf("+++System : Initialization of POSIX signals failed\n");
}

return(EXIT_FAILURE);
}

if (sigaction(SIGCONT, &action, NULL) != 0)
{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("+++Système : Initialisation des signaux POSIX "	printf("+++Système : Initialisation des signaux POSIX "
Line 514 rplinit(int argc, char *argv[], unsigned	Line 469 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	signal_test = SIGTEST;
action.sa_sigaction = interruption5;	kill(getpid(), SIGTERM);
# else
action.sa_handler = interruption5;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGFSTOP, &action, NULL) != 0)	if (signal_test != SIGTERM)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 538 rplinit(int argc, char *argv[], unsigned	Line 489 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	action.sa_handler = interruption2;
action.sa_sigaction = interruption11;	action.sa_flags = SA_NODEFER \| SA_ONSTACK;
# else
action.sa_handler = interruption11;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGFABORT, &action, NULL) != 0)	if (sigaction(SIGTSTP, &action, NULL) != 0)
{	{
erreur = d_es_signal;

if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("+++Système : Initialisation des signaux POSIX "	printf("+++Système : Initialisation des signaux POSIX "
Line 562 rplinit(int argc, char *argv[], unsigned	Line 507 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	signal_test = SIGTEST;
action.sa_sigaction = interruption8;	kill(getpid(), SIGTSTP);
# else
action.sa_handler = interruption8;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGURG, &action, NULL) != 0)	if (signal_test != SIGTSTP)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 586 rplinit(int argc, char *argv[], unsigned	Line 527 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	action.sa_handler = interruption5;
action.sa_sigaction = interruption7;	action.sa_flags = SA_NODEFER \| SA_ONSTACK;
# else
action.sa_handler = interruption7;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGPIPE, &action, NULL) != 0)	if (sigaction(SIGPIPE, &action, NULL) != 0)
{	{
Line 610 rplinit(int argc, char *argv[], unsigned	Line 547 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	signal_test = SIGTEST;
action.sa_sigaction = interruption6;	kill(getpid(), SIGPIPE);
# else
action.sa_handler = interruption6;
# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO \| SA_NODEFER;

if (sigaction(SIGINJECT, &action, NULL) != 0)	if (signal_test != SIGPIPE)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 634 rplinit(int argc, char *argv[], unsigned	Line 567 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	action.sa_handler = interruption1;
action.sa_sigaction = interruption9;	action.sa_flags = SA_NODEFER \| SA_ONSTACK;
# else
action.sa_handler = interruption9;
# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO \| SA_NODEFER;

if (sigaction(SIGABORT, &action, NULL) != 0)	if (sigaction(SIGALRM, &action, NULL) != 0)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 658 rplinit(int argc, char *argv[], unsigned	Line 587 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	signal_test = SIGTEST;
action.sa_sigaction = interruption1;	kill(getpid(), SIGALRM);
# else
action.sa_handler = interruption1;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGALRM, &action, NULL) != 0)	if (signal_test != SIGALRM)
{	{
erreur = d_es_signal;	erreur = d_es_signal;

Line 682 rplinit(int argc, char *argv[], unsigned	Line 607 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

# ifndef _BROKEN_SIGINFO	signal_test = SIGTEST + 1;
action.sa_sigaction = interruption3;
# else
action.sa_handler = interruption3;
# endif
action.sa_flags = SA_NODEFER \| SA_ONSTACK \| SA_SIGINFO;

erreur = d_absence_erreur;	erreur = d_absence_erreur;
core = d_faux;	core = d_faux;
Line 1576 rplinit(int argc, char *argv[], unsigned	Line 1496 rplinit(int argc, char *argv[], unsigned

if (debug == d_faux)	if (debug == d_faux)
{	{
	action.sa_handler = interruption3;
	action.sa_flags = SA_NODEFER \| SA_ONSTACK;

if (sigaction(SIGSEGV, &action, NULL) != 0)	if (sigaction(SIGSEGV, &action, NULL) != 0)
{	{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
Line 1611 rplinit(int argc, char *argv[], unsigned	Line 1534 rplinit(int argc, char *argv[], unsigned

if (option_n == d_vrai)	if (option_n == d_vrai)
{	{
# ifndef _BROKEN_SIGINFO	action.sa_handler = interruption4;
action.sa_sigaction = interruption10;	action.sa_flags = SA_ONSTACK;
# else
action.sa_handler = interruption10;
# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGHUP, &action, NULL) != 0)	if (sigaction(SIGHUP, &action, NULL) != 0)
{	{
Line 2010 rplinit(int argc, char *argv[], unsigned	Line 1929 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).var_volatile_recursivite = 0;	(*s_etat_processus).var_volatile_recursivite = 0;
(*s_etat_processus).var_volatile_exception_gsl = 0;	(*s_etat_processus).var_volatile_exception_gsl = 0;
(*s_etat_processus).arret_depuis_abort = 0;	(*s_etat_processus).arret_depuis_abort = 0;
	(*s_etat_processus).pointeur_signal_lecture = 0;
	(*s_etat_processus).pointeur_signal_ecriture = 0;

initialisation_allocateur(s_etat_processus);	initialisation_allocateur(s_etat_processus);
initialisation_drapeaux(s_etat_processus);	initialisation_drapeaux(s_etat_processus);
Line 2758 rplinit(int argc, char *argv[], unsigned	Line 2679 rplinit(int argc, char *argv[], unsigned
lancement_daemon(s_etat_processus);	lancement_daemon(s_etat_processus);
}	}

	// A FIXER
	// création signaux
if (option_p == d_faux)	if (option_p == d_faux)
{	{
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur(s_etat_processus);	erreur = sequenceur(s_etat_processus);

	if (erreur == d_absence_erreur)
	{
	if (((*s_etat_processus).var_volatile_alarme
	== 0) && ((*s_etat_processus)
	.arret_depuis_abort == 0) &&
	((*s_etat_processus).at_exit
	!= NULL))
	{
	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
else	else
Line 2770 rplinit(int argc, char *argv[], unsigned	Line 2707 rplinit(int argc, char *argv[], unsigned
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur_optimise(s_etat_processus);	erreur = sequenceur_optimise(s_etat_processus);
}
}

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme == 0)	if (((*s_etat_processus).var_volatile_alarme
&& ((*s_etat_processus).arret_depuis_abort	== 0) && ((*s_etat_processus)
== 0) && ((*s_etat_processus).at_exit	.arret_depuis_abort == 0) &&
!= NULL))	((*s_etat_processus).at_exit
{	!= NULL))
erreur = evaluation(s_etat_processus,	{
(*s_etat_processus).at_exit, 'E');	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
	// A FIXER
	// destruction signaux
}	}

liberation(s_etat_processus, (*s_etat_processus).at_exit);	liberation(s_etat_processus, (*s_etat_processus).at_exit);
Line 2898 rplinit(int argc, char *argv[], unsigned	Line 2839 rplinit(int argc, char *argv[], unsigned
{	{
if ((*s_etat_processus).var_volatile_alarme != 0)	if ((*s_etat_processus).var_volatile_alarme != 0)
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(
	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet))	l_element_courant)).donnee).objet))
.thread).pid, SIGURG);	.thread).pid, rpl_sigurg);
}	}
else	else
{	{
if ((*s_etat_processus).arret_depuis_abort	if ((*s_etat_processus).arret_depuis_abort
== -1)	== -1)
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(
	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet))	l_element_courant)).donnee).objet))
.thread).pid, SIGFABORT);	.thread).pid, rpl_sigabort);
}	}
else	else
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(
	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet))	l_element_courant)).donnee).objet))
.thread).pid, SIGFSTOP);	.thread).pid, rpl_sigstop);
}	}
}	}
}	}
Line 2937 rplinit(int argc, char *argv[], unsigned	Line 2881 rplinit(int argc, char *argv[], unsigned
if ((*s_etat_processus).var_volatile_alarme	if ((*s_etat_processus).var_volatile_alarme
!= 0)	!= 0)
{	{
pthread_kill(((((struct_processus_fils *)	envoi_signal_thread(
	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet))	l_element_courant)).donnee).objet))
.thread).tid, SIGURG);	.thread).tid, rpl_sigurg);
}	}
else	else
{	{
if ((*s_etat_processus).arret_depuis_abort	if ((*s_etat_processus).arret_depuis_abort
== -1)	== -1)
{	{
pthread_kill(	envoi_signal_thread(
((((struct_processus_fils *)	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee)	l_element_courant)).donnee)
.objet)).thread).tid,	.objet)).thread).tid,
SIGFABORT);	rpl_sigabort);
}	}
else	else
{	{
pthread_kill(	envoi_signal_thread(
((((struct_processus_fils *)	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee)	l_element_courant)).donnee)
.objet)).thread).tid,	.objet)).thread).tid,
SIGFSTOP);	rpl_sigstop);
}	}
}	}
}	}
Line 3611 rplinit(int argc, char *argv[], unsigned	Line 3556 rplinit(int argc, char *argv[], unsigned
sem_gestionnaires_signaux_atomique);	sem_gestionnaires_signaux_atomique);
# endif	# endif

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);	liberation_contexte_cas(s_etat_processus);
# undef return
# endif

free((*s_etat_processus).chemin_fichiers_temporaires);	free((*s_etat_processus).chemin_fichiers_temporaires);
free(s_etat_processus);	free(s_etat_processus);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.74
changed lines
	Added in v.1.83