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.20 and 1.38

version 1.20, 2010/06/04 07:48:20	version 1.38, 2010/08/31 09:57:43
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.16	RPL/2 (R) version 4.0.19
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2010 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 20	Line 20
*/	*/


#include "rpl.conv.h"	#include "rpl-conv.h"


/*	/*
Line 125 insertion_thread(struct_processus *s_eta	Line 125 insertion_thread(struct_processus *s_eta
}	}

(*l_nouvel_objet).suivant = liste_threads;	(*l_nouvel_objet).suivant = liste_threads;

liste_threads = l_nouvel_objet;	liste_threads = l_nouvel_objet;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
Line 184 insertion_thread_surveillance(struct_pro	Line 183 insertion_thread_surveillance(struct_pro
}	}
}	}

printf("<1> +1 %d\n", (*s_argument_thread).nombre_references);	pthread_mutex_lock(&((*s_argument_thread).mutex));
	(*s_argument_thread).nombre_references++;
	pthread_mutex_unlock(&((*s_argument_thread).mutex));

(*l_nouvel_objet).suivant = liste_threads_surveillance;	(*l_nouvel_objet).suivant = liste_threads_surveillance;
(l_nouvel_objet).donnee = (void ) s_argument_thread;	(l_nouvel_objet).donnee = (void ) s_argument_thread;

Line 391 retrait_thread_surveillance(struct_proce	Line 393 retrait_thread_surveillance(struct_proce
}	}

(*s_argument_thread).nombre_references--;	(*s_argument_thread).nombre_references--;
printf("<3> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread);

BUG((*s_argument_thread).nombre_references < 0,	BUG((*s_argument_thread).nombre_references < 0,
printf("(*s_argument_thread).nombre_references = %d\n",	printf("(*s_argument_thread).nombre_references = %d\n",
(int) (*s_argument_thread).nombre_references));	(int) (*s_argument_thread).nombre_references));

printf("retrait_thread_surveillance : %d\n", (*s_argument_thread).nombre_references);
if ((*s_argument_thread).nombre_references == 0)	if ((*s_argument_thread).nombre_references == 0)
{	{
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0)
Line 684 liberation_threads(struct_processus *s_e	Line 684 liberation_threads(struct_processus *s_e
}	}

(*s_argument_thread).nombre_references--;	(*s_argument_thread).nombre_references--;
printf("<1> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread);

BUG((*s_argument_thread).nombre_references < 0,	BUG((*s_argument_thread).nombre_references < 0,
printf("(*s_argument_thread).nombre_references = %d\n",	printf("(*s_argument_thread).nombre_references = %d\n",
Line 1359 printf("<1> -1 %d %p\n", (*s_argument_th	Line 1358 printf("<1> -1 %d %p\n", (*s_argument_th
}	}

(*s_argument_thread).nombre_references--;	(*s_argument_thread).nombre_references--;
printf("<2> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread);

BUG((*s_argument_thread).nombre_references < 0,	BUG((*s_argument_thread).nombre_references < 0,
printf("(*s_argument_thread).nombre_references = %d\n",	printf("(*s_argument_thread).nombre_references = %d\n",
Line 1599 verrouillage_gestionnaire_signaux()	Line 1597 verrouillage_gestionnaire_signaux()
while(sem_trywait(semaphore_liste_threads) == -1)	while(sem_trywait(semaphore_liste_threads) == -1)
# endif	# endif
{	{
	perror("sem_trywait");
if ((errno != EINTR) && (errno != EAGAIN))	if ((errno != EINTR) && (errno != EAGAIN))
{	{
pthread_sigmask(SIG_SETMASK, &oldset, NULL);	pthread_sigmask(SIG_SETMASK, &oldset, NULL);
Line 1727 deverrouillage_gestionnaire_signaux()	Line 1726 deverrouillage_gestionnaire_signaux()
}	}

void	void
interruption1(int signal, siginfo_t siginfo, void context)	interruption1(SIGHANDLER_ARGS)
{	{
	pid_t pid;

pthread_t thread;	pthread_t thread;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;
Line 1737 interruption1(int signal, siginfo_t *sig	Line 1738 interruption1(int signal, siginfo_t *sig

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

	# ifdef _BROKEN_SIGINFO
	if (signal == SIGINT)
	{
	// Si l'interruption provient du clavier, il n'y a pas eu d'appel
	// à queue_in().

	pid = getpid();
	}
	else
	{
	pid = origine_signal(signal);
	}
	# else
	pid = (*siginfo).si_pid;
	# endif

switch(signal)	switch(signal)
{	{
case SIGALRM :	case SIGALRM :
{	{
if ((*siginfo).si_pid == getpid())	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(),	if ((s_etat_processus = recherche_thread(getpid(),
pthread_self())) == NULL)	pthread_self())) == NULL)
{	{
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
return;	return;
}	}

if (((*s_etat_processus).type_debug & d_debug_signaux) != 0)	if (((*s_etat_processus).type_debug & d_debug_signaux) != 0)
Line 1786 interruption1(int signal, siginfo_t *sig	Line 1803 interruption1(int signal, siginfo_t *sig
* Solaris suit en particulier cette spécification.	* Solaris suit en particulier cette spécification.
*/	*/

	# ifndef _BROKEN_SIGINFO
if (siginfo == NULL)	if (siginfo == NULL)
{	{
kill(getpid(), signal);	kill(getpid(), signal);
}	}
else if ((*siginfo).si_pid == getpid())	else
	# endif
	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(),	if ((s_etat_processus = recherche_thread(getpid(),
pthread_self())) == NULL)	pthread_self())) == NULL)
Line 1865 interruption1(int signal, siginfo_t *sig	Line 1885 interruption1(int signal, siginfo_t *sig
}	}

void	void
interruption2(int signal, siginfo_t siginfo, void context)	interruption2(SIGHANDLER_ARGS)
{	{
	pid_t pid;

pthread_t thread;	pthread_t thread;

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

	# ifndef _BROKEN_SIGINFO
if (siginfo == NULL)	if (siginfo == NULL)
{	{
/*	/*
Line 1889 interruption2(int signal, siginfo_t *sig	Line 1919 interruption2(int signal, siginfo_t *sig
return;	return;
}	}
}	}
else if ((*siginfo).si_pid == getpid())	else
	# endif
	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))	if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))
== NULL)	== NULL)
Line 1937 interruption2(int signal, siginfo_t *sig	Line 1969 interruption2(int signal, siginfo_t *sig
}	}

void	void
interruption3(int signal, siginfo_t siginfo, void context)	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 1997 interruption3(int signal, siginfo_t *sig	Line 2037 interruption3(int signal, siginfo_t *sig
}	}

void	void
interruption4(int signal, siginfo_t siginfo, void context)	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 2025 interruption4(int signal, siginfo_t *sig	Line 2073 interruption4(int signal, siginfo_t *sig
}	}

void	void
interruption5(int signal, siginfo_t siginfo, void context)	interruption5(SIGHANDLER_ARGS)
{	{
	pid_t pid;

pthread_t thread;	pthread_t thread;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

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

	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))	if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))
== NULL)	== NULL)
Line 2088 interruption5(int signal, siginfo_t *sig	Line 2145 interruption5(int signal, siginfo_t *sig
}	}

void	void
interruption6(int signal, siginfo_t siginfo, void context)	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 2112 interruption6(int signal, siginfo_t *sig	Line 2177 interruption6(int signal, siginfo_t *sig
}	}

void	void
interruption7(int signal, siginfo_t siginfo, void context)	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 2139 interruption7(int signal, siginfo_t *sig	Line 2212 interruption7(int signal, siginfo_t *sig
}	}

void	void
interruption8(int signal, siginfo_t siginfo, void context)	interruption8(SIGHANDLER_ARGS)
{	{
	pid_t pid;

pthread_t thread;	pthread_t thread;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

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

	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))	if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))
== NULL)	== NULL)
Line 2182 interruption8(int signal, siginfo_t *sig	Line 2264 interruption8(int signal, siginfo_t *sig
}	}

void	void
interruption9(int signal, siginfo_t siginfo, void context)	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 2201 interruption9(int signal, siginfo_t *sig	Line 2291 interruption9(int signal, siginfo_t *sig
fflush(stdout);	fflush(stdout);
}	}

	# ifdef _BROKEN_SIGINFO
	if (queue_in(getpid(), signal) != 0)
	{
	return;
	}

	deverrouillage_gestionnaire_signaux();
	interruption11(signal);
	# else
deverrouillage_gestionnaire_signaux();	deverrouillage_gestionnaire_signaux();
interruption11(signal, siginfo, context);	interruption11(signal, siginfo, context);
	# endif
return;	return;
}	}

void	void
interruption10(int signal, siginfo_t siginfo, void context)	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();
Line 2248 interruption10(int signal, siginfo_t *si	Line 2356 interruption10(int signal, siginfo_t *si
}	}

void	void
interruption11(int signal, siginfo_t siginfo, void context)	interruption11(SIGHANDLER_ARGS)
{	{
	pid_t pid;

pthread_t thread;	pthread_t thread;

struct_processus *s_etat_processus;	struct_processus *s_etat_processus;

verrouillage_gestionnaire_signaux();	verrouillage_gestionnaire_signaux();

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

	if (pid == getpid())
{	{
if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))	if ((s_etat_processus = recherche_thread(getpid(), pthread_self()))
== NULL)	== NULL)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.20
changed lines
	Added in v.1.38