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.164 and 1.175

version 1.164, 2015/01/08 14:29:52	version 1.175, 2015/12/13 22:55:24
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.20	RPL/2 (R) version 4.1.24
Copyright (C) 1989-2015 Dr. BERTRAND Joël	Copyright (C) 1989-2015 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 132 rplinit(int argc, char argv[], char en	Line 132 rplinit(int argc, char argv[], char en
setvbuf(stdout, NULL, _IOLBF, 0);	setvbuf(stdout, NULL, _IOLBF, 0);
setvbuf(stderr, NULL, _IOLBF, 0);	setvbuf(stderr, NULL, _IOLBF, 0);

if ((s_etat_processus = malloc(sizeof(struct_processus))) == NULL)	if ((s_etat_processus = sys_malloc(sizeof(struct_processus))) == NULL)
{	{
erreur = d_es_allocation_memoire;	erreur = d_es_allocation_memoire;

Line 182 rplinit(int argc, char argv[], char en	Line 182 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

	if (initialisation_etat_processus_readline() != 0)
	{
	erreur = d_es_allocation_memoire;

	if ((langue = getenv("LANG")) != NULL)
	{
	if (strncmp(langue, "fr", 2) == 0)
	{
	uprintf("+++Système : Mémoire insuffisante\n");
	}
	else
	{
	uprintf("+++System : Not enough memory\n");
	}
	}
	else
	{
	uprintf("+++System : Not enough memory\n");
	}

	return(EXIT_FAILURE);
	}

if ((langue = getenv("LANG")) != NULL)	if ((langue = getenv("LANG")) != NULL)
{	{
(*s_etat_processus).langue = (strncmp(langue, "fr", 2) == 0)	(*s_etat_processus).langue = (strncmp(langue, "fr", 2) == 0)
Line 206 rplinit(int argc, char argv[], char en	Line 229 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if ((arg_exec = malloc((((size_t) argc) + 1) * sizeof(char *))) == NULL)	if ((arg_exec = sys_malloc((((size_t) argc) + 1) * sizeof(char *))) == NULL)
{	{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
Line 225 rplinit(int argc, char argv[], char en	Line 248 rplinit(int argc, char argv[], char en
arg_exec[i] = argv[i];	arg_exec[i] = argv[i];
}	}

argv[argc] = NULL;	arg_exec[argc] = NULL;

initialisation_contexte_cas(s_etat_processus);	initialisation_contexte_cas(s_etat_processus);

Line 261 rplinit(int argc, char argv[], char en	Line 284 rplinit(int argc, char argv[], char en
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
	pthread_mutex_init(&((*s_etat_processus).mutex_allocation_buffer),
	&attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex);	pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);
Line 270 rplinit(int argc, char argv[], char en	Line 299 rplinit(int argc, char argv[], char en
pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex);	pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);	sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);
# else	# else
Line 1992 rplinit(int argc, char argv[], char en	Line 2026 rplinit(int argc, char argv[], char en
}	}

if (((*s_etat_processus).definitions_chainees =	if (((*s_etat_processus).definitions_chainees =
compactage((*s_etat_processus)	compactage(s_etat_processus,
.definitions_chainees)) == NULL)	(*s_etat_processus).definitions_chainees))
	== NULL)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));
Line 5371 rplinit(int argc, char argv[], char en	Line 5406 rplinit(int argc, char argv[], char en
{	{
if ((*resultats) != NULL)	if ((*resultats) != NULL)
{	{
free((*resultats));	sys_free((*resultats));

if (((*resultats) = malloc(((size_t)	if (((*resultats) = sys_malloc(((size_t)
((*s_etat_processus)	((*s_etat_processus)
.hauteur_pile_operationnelle + 1))	.hauteur_pile_operationnelle + 1))
* sizeof(unsigned char **))) != NULL)	* sizeof(unsigned char **))) != NULL)
Line 5727 rplinit(int argc, char argv[], char en	Line 5762 rplinit(int argc, char argv[], char en
erreur = d_erreur;	erreur = d_erreur;
}	}

free(arg_exec);	sys_free(arg_exec);
arret_thread_signaux(s_etat_processus);	arret_thread_signaux(s_etat_processus);
	liberation_etat_processus_readline();
liberation_allocateur_buffer(s_etat_processus);	liberation_allocateur_buffer(s_etat_processus);
free(s_etat_processus);	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer));
	sys_free(s_etat_processus);

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
debug_memoire_verification();	debug_memoire_verification();
Line 5856 controle_integrite(struct_processus *s_e	Line 5893 controle_integrite(struct_processus *s_e


unsigned char *	unsigned char *
date_compilation()	date_compilation(struct_processus *s_etat_processus)
{	{
unsigned char *date;	unsigned char *date;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.164
changed lines
	Added in v.1.175