rpl/src/instructions_d5.c - diff

Return to instructions_d5.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_d5.c between versions 1.68 and 1.69

version 1.68, 2011/09/14 17:55:59	version 1.69, 2011/09/15 17:51:43
Line 814 instruction_der(struct_processus *s_etat	Line 814 instruction_der(struct_processus *s_etat
void	void
instruction_detach(struct_processus *s_etat_processus)	instruction_detach(struct_processus *s_etat_processus)
{	{
	int pipe_initialisation_segment_signaux[2];

logical1 drapeau;	logical1 drapeau;
logical1 variable_partagee;	logical1 variable_partagee;

Line 828 instruction_detach(struct_processus *s_e	Line 830 instruction_detach(struct_processus *s_e

sig_atomic_t registre_stop;	sig_atomic_t registre_stop;

sigset_t oldset;
sigset_t set;

ssize_t longueur_ecriture;	ssize_t longueur_ecriture;

struct_descripteur_thread *s_argument_thread;	struct_descripteur_thread *s_argument_thread;
Line 850 instruction_detach(struct_processus *s_e	Line 849 instruction_detach(struct_processus *s_e

struct timespec attente;	struct timespec attente;

	unsigned char caractere;
unsigned char *message;	unsigned char *message;

unsigned int erreur;	unsigned int erreur;
Line 1085 instruction_detach(struct_processus *s_e	Line 1085 instruction_detach(struct_processus *s_e
return;	return;
}	}

	if (pipe(pipe_initialisation_segment_signaux) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

ppid = getpid();	ppid = getpid();

/*	/*
Line 1104 instruction_detach(struct_processus *s_e	Line 1110 instruction_detach(struct_processus *s_e
* de mémoire, ni libération, ni copie d'objet concurrent au fork().	* de mémoire, ni libération, ni copie d'objet concurrent au fork().
*/	*/

sigfillset(&set);
pthread_sigmask(SIG_BLOCK, &set, &oldset);
verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);
(*s_argument_thread).pid = fork();	(*s_argument_thread).pid = fork();
deverrouillage_threads_concurrents(s_etat_processus);	deverrouillage_threads_concurrents(s_etat_processus);
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
sigpending(&set);

(*s_argument_thread).thread_pere = pthread_self();	(*s_argument_thread).thread_pere = pthread_self();
(*s_argument_thread).processus_detache = d_vrai;	(*s_argument_thread).processus_detache = d_vrai;
Line 1279 instruction_detach(struct_processus *s_e	Line 1281 instruction_detach(struct_processus *s_e
(*s_etat_processus).pointeur_signal_lecture = 0;	(*s_etat_processus).pointeur_signal_lecture = 0;
(*s_etat_processus).pointeur_signal_ecriture = 0;	(*s_etat_processus).pointeur_signal_ecriture = 0;

	if (write_atomic(s_etat_processus,
	pipe_initialisation_segment_signaux[1],
	"-", sizeof(unsigned char)) != sizeof(unsigned char))
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	}

	close(pipe_initialisation_segment_signaux[0]);
	close(pipe_initialisation_segment_signaux[1]);

if ((*s_etat_processus).debug == d_vrai)	if ((*s_etat_processus).debug == d_vrai)
if (((*s_etat_processus).type_debug &	if (((*s_etat_processus).type_debug &
d_debug_processus) != 0)	d_debug_processus) != 0)
Line 2418 instruction_detach(struct_processus *s_e	Line 2430 instruction_detach(struct_processus *s_e

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
pthread_mutex_lock(&((*s_etat_processus).mutex));	pthread_mutex_lock(&((*s_etat_processus).mutex));

	scrutation_interruptions(s_etat_processus);
}	}

pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex));
Line 2822 instruction_detach(struct_processus *s_e	Line 2836 instruction_detach(struct_processus *s_e
}	}
}	}

	scrutation_interruptions(s_etat_processus);
l_element_courant = (*l_element_courant).suivant;	l_element_courant = (*l_element_courant).suivant;
}	}
} while(drapeau == d_vrai);	} while(drapeau == d_vrai);
Line 2841 instruction_detach(struct_processus *s_e	Line 2856 instruction_detach(struct_processus *s_e
return;	return;
}	}

	// On attend une donnée fictive pour être sûr que le segment de mémoire
	// partagée destiné à la gestion des signaux est bien initialisé.

	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

	while(read_atomic(s_etat_processus,
	pipe_initialisation_segment_signaux[0],
	&caractere, sizeof(caractere)) == 0)
	{
	scrutation_interruptions(s_etat_processus);
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	}

	close(pipe_initialisation_segment_signaux[0]);
	close(pipe_initialisation_segment_signaux[1]);

// Être sûr que le processus fils soit déjà présent...	// Être sûr que le processus fils soit déjà présent...

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

while(kill((*s_argument_thread).pid, 0) != 0)	while(envoi_signal_processus((*s_argument_thread).pid, rpl_signull) != 0)
{	{
//if ((errno != ESRCH) && (errno != EAGAIN))	if (errno != ENOENT)
if (errno != ESRCH)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex));
return;	return;
}	}

	scrutation_interruptions(s_etat_processus);
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.68
changed lines
	Added in v.1.69