rpl/src/interruptions.c - diff

Return to interruptions.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/interruptions.c between versions 1.46.2.3 and 1.62

version 1.46.2.3, 2011/05/09 13:52:23	version 1.62, 2011/09/01 12:14:56
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.24	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 803 liberation_threads(struct_processus *s_e	Line 803 liberation_threads(struct_processus *s_e
}	}
}	}

for(i = 0; i < (*s_etat_processus).nombre_variables; i++)	liberation_arbre_variables(s_etat_processus,
{	(*s_etat_processus).s_arbre_variables, d_faux);
pthread_mutex_trylock(&(((s_etat_processus)
.s_liste_variables[i].objet).mutex));
pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables[i].objet).mutex));

// Les variables de niveau 0 sont des définitions qui
// ne sont pas copiées entre threads.
if ((*s_etat_processus).s_liste_variables[i].niveau > 0)
{
liberation(s_etat_processus,
(*s_etat_processus).s_liste_variables[i].objet);
}

free((*s_etat_processus).s_liste_variables[i].nom);
}

free((*s_etat_processus).s_liste_variables);

for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)	for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)
{	{
Line 1335 liberation_threads(struct_processus *s_e	Line 1318 liberation_threads(struct_processus *s_e
sem_destroy2((*s_etat_processus).semaphore_fork, sem_fork);	sem_destroy2((*s_etat_processus).semaphore_fork, sem_fork);
# endif	# endif

	liberation_contexte_cas(s_etat_processus);
free(s_etat_processus);	free(s_etat_processus);

s_etat_processus = candidat;	s_etat_processus = candidat;
Line 2007 interruption2(SIGHANDLER_ARGS)	Line 1991 interruption2(SIGHANDLER_ARGS)
void	void
interruption3(SIGHANDLER_ARGS)	interruption3(SIGHANDLER_ARGS)
{	{
pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

static int compteur = 0;	static int compteur = 0;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
Line 2075 interruption3(SIGHANDLER_ARGS)	Line 2051 interruption3(SIGHANDLER_ARGS)
void	void
interruption4(SIGHANDLER_ARGS)	interruption4(SIGHANDLER_ARGS)
{	{
pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
Line 2183 interruption5(SIGHANDLER_ARGS)	Line 2151 interruption5(SIGHANDLER_ARGS)
void	void
interruption6(SIGHANDLER_ARGS)	interruption6(SIGHANDLER_ARGS)
{	{
pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
Line 2215 interruption6(SIGHANDLER_ARGS)	Line 2175 interruption6(SIGHANDLER_ARGS)
void	void
interruption7(SIGHANDLER_ARGS)	interruption7(SIGHANDLER_ARGS)
{	{
pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
Line 2302 interruption8(SIGHANDLER_ARGS)	Line 2254 interruption8(SIGHANDLER_ARGS)
void	void
interruption9(SIGHANDLER_ARGS)	interruption9(SIGHANDLER_ARGS)
{	{
pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
Line 2347 interruption10(SIGHANDLER_ARGS)	Line 2291 interruption10(SIGHANDLER_ARGS)
{	{
file *fichier;	file *fichier;

pid_t pid;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

unsigned char nom[8 + 64 + 1];	unsigned char nom[8 + 64 + 1];

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

# ifdef _BROKEN_SIGINFO
pid = origine_signal(signal);
# else
pid = (*siginfo).si_pid;
# endif

if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)	if ((s_etat_processus = recherche_thread(getpid(), pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();

CVSweb interface <joel.bertrand@systella.fr>

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