rpl/src/gestion_processus.c - diff

Return to gestion_processus.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/gestion_processus.c between versions 1.22 and 1.52

version 1.22, 2010/07/31 10:34:17	version 1.52, 2012/03/01 10:14:04
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.18	RPL/2 (R) version 4.1.7
Copyright (C) 1989-2010 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 20	Line 20
*/	*/


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


/*	/*
Line 57 surveillance_processus(void *argument)	Line 57 surveillance_processus(void *argument)

pthread_t tid_candidat;	pthread_t tid_candidat;

sigset_t masque;

ssize_t longueur_ecriture;	ssize_t longueur_ecriture;

struct_descripteur_thread *s_argument_thread;	struct_descripteur_thread *s_argument_thread;
Line 75 surveillance_processus(void *argument)	Line 73 surveillance_processus(void *argument)
unsigned int tampon_erreur_execution;	unsigned int tampon_erreur_execution;
unsigned int tampon_erreur_systeme;	unsigned int tampon_erreur_systeme;

sigemptyset(&masque);
sigaddset(&masque, SIGINJECT);
sigaddset(&masque, SIGFSTOP);
sigaddset(&masque, SIGFABORT);
sigaddset(&masque, SIGURG);
sigaddset(&masque, SIGALRM);
sigaddset(&masque, SIGCONT);
sigaddset(&masque, SIGINT);
pthread_sigmask(SIG_BLOCK, &masque, NULL);

s_argument_thread = argument;	s_argument_thread = argument;
s_etat_processus = (*s_argument_thread).s_etat_processus;	s_etat_processus = (*s_argument_thread).s_etat_processus;

Line 344 surveillance_processus(void *argument)	Line 332 surveillance_processus(void *argument)
d_es_processus;	d_es_processus;
}	}

pthread_kill((*s_argument_thread).thread_pere,	envoi_signal_thread((*s_argument_thread).thread_pere,
SIGINJECT);	rpl_siginject);
}	}
}	}
else	else
Line 530 surveillance_processus(void *argument)	Line 518 surveillance_processus(void *argument)
d_es_processus;	d_es_processus;
}	}

pthread_kill((*s_argument_thread).thread_pere,	envoi_signal_thread((*s_argument_thread).thread_pere,
SIGINJECT);	rpl_siginject);
}	}
}	}
else	else
Line 925 surveillance_processus(void *argument)	Line 913 surveillance_processus(void *argument)
(*s_etat_processus).erreur_systeme_processus_fils =	(*s_etat_processus).erreur_systeme_processus_fils =
d_es_processus;	d_es_processus;
}	}

	envoi_signal_thread((*s_argument_thread).thread_pere,
	rpl_siginject);
}	}
}	}
else	else
Line 1839 surveillance_processus(void *argument)	Line 1830 surveillance_processus(void *argument)
}	}

pthread_exit(NULL);	pthread_exit(NULL);
	return(NULL);
}	}


Line 3396 lecture_pipe(struct_processus *s_etat_pr	Line 3388 lecture_pipe(struct_processus *s_etat_pr
================================================================================	================================================================================
*/	*/

extern inline void	void
scrutation_injection(struct_processus *s_etat_processus)	scrutation_injection(struct_processus *s_etat_processus)
{	{
fd_set ensemble_descripteurs;	fd_set ensemble_descripteurs;

# ifndef OpenBSD	logical1 drapeau_erreur;
	logical1 registre_arret_si_exception;

	# ifdef PSELECT
struct timespec timeout;	struct timespec timeout;
# else	# else
struct timeval timeout;	struct timeval timeout;
# endif	# endif

logical1 drapeau_erreur;
logical1 registre_arret_si_exception;

unsigned char tampon;	unsigned char tampon;
unsigned char tampon_profilage[20];	unsigned char tampon_profilage[20];

// Si on est dans le processus père, il n'y a rien à surveiller.	// Si on est dans le processus père, il n'y a rien à surveiller.

if ((*s_etat_processus).var_volatile_processus_pere == 0)	scrutation_interruptions(s_etat_processus);

	if ((*s_etat_processus).var_volatile_processus_racine == 0)
{	{
FD_ZERO(&ensemble_descripteurs);	FD_ZERO(&ensemble_descripteurs);
FD_SET((*s_etat_processus).pipe_nombre_injections,	FD_SET((*s_etat_processus).pipe_nombre_injections,
&ensemble_descripteurs);	&ensemble_descripteurs);

# ifndef OpenBSD	# ifdef PSELECT
timeout.tv_sec = 0;	timeout.tv_sec = 0;
timeout.tv_nsec = 0;	timeout.tv_nsec = 0;

Line 3609 scrutation_injection(struct_processus *s	Line 3603 scrutation_injection(struct_processus *s
================================================================================	================================================================================
*/	*/

inline int test_arret(struct_processus *s_etat_processus)	int
	test_arret(struct_processus *s_etat_processus)
{	{
return((int) (*s_etat_processus).var_volatile_requete_arret);	return((int) (*s_etat_processus).var_volatile_requete_arret);
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.22
changed lines
	Added in v.1.52