rpl/src/instructions_w1.c - diff

Return to instructions_w1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_w1.c between versions 1.78 and 1.106

version 1.78, 2013/03/20 17:11:45	version 1.106, 2017/01/18 15:44:23
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.13	RPL/2 (R) version 4.1.26
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2017 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 245 instruction_wait(struct_processus *s_eta	Line 245 instruction_wait(struct_processus *s_eta
return;	return;
}	}

temporisation.tv_sec = (long) floor((double) attente);	temporisation.tv_sec = (time_t) floor((double) attente);
temporisation.tv_nsec = (attente - temporisation.tv_sec) *	temporisation.tv_nsec = (long) ((attente -
(long) 1000000000;	((real8) temporisation.tv_sec)) * (integer8) 1000000000);

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 289 instruction_wait(struct_processus *s_eta	Line 289 instruction_wait(struct_processus *s_eta

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_en_queue != 0)	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
traitement_interruptions_logicielles(s_etat_processus);	traitement_interruptions_logicielles(s_etat_processus);
Line 390 instruction_write(struct_processus *s_et	Line 404 instruction_write(struct_processus *s_et
integer8 clef;	integer8 clef;
integer8 compteur;	integer8 compteur;
integer8 id;	integer8 id;
	integer8 longueur;
integer8 longueur_effective;	integer8 longueur_effective;
integer8 ordre;	integer8 ordre;
	integer8 recursivite;

logical1 format_degenere;	logical1 format_degenere;
logical1 mise_a_jour;	logical1 mise_a_jour;

long longueur;
long recursivite;

sqlite3_stmt *ppStmt;	sqlite3_stmt *ppStmt;

Line 698 instruction_write(struct_processus *s_et	Line 712 instruction_write(struct_processus *s_et

free(chaine);	free(chaine);

if (alsprintf(&commande, "insert or replace into data "	if (alsprintf(s_etat_processus, &commande,
	"insert or replace into data "
"(id, data) values (%lld, '%s')", (((integer8 )	"(id, data) values (%lld, '%s')", (((integer8 )
(*s_objet_argument_2).objet)), chaine_utf8) < 0)	(*s_objet_argument_2).objet)), chaine_utf8) < 0)
{	{
Line 710 instruction_write(struct_processus *s_et	Line 725 instruction_write(struct_processus *s_et
free(chaine_utf8);	free(chaine_utf8);

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
Line 748 instruction_write(struct_processus *s_et	Line 763 instruction_write(struct_processus *s_et

// Récupération de la position de la clef	// Récupération de la position de la clef

if (alsprintf(&commande, "select key from control "	if (alsprintf(s_etat_processus, &commande,
"where id = 1") < 0)	"select key from control where id = 1") < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 757 instruction_write(struct_processus *s_et	Line 772 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
Line 925 instruction_write(struct_processus *s_et	Line 940 instruction_write(struct_processus *s_et

// Récupération de l'identifiant de la clef	// Récupération de l'identifiant de la clef

if (alsprintf(&commande, "select id from key where key = "	if (alsprintf(s_etat_processus, &commande,
"'%s'", clef_utf8) < 0)	"select id from key where key = '%s'", clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 934 instruction_write(struct_processus *s_et	Line 949 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
Line 971 instruction_write(struct_processus *s_et	Line 986 instruction_write(struct_processus *s_et

free(commande);	free(commande);

if (alsprintf(&commande, "insert into key "	if (alsprintf(s_etat_processus, &commande,
"(key) values ('%s')", clef_utf8) < 0)	"insert into key (key) values ('%s')",
	clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 980 instruction_write(struct_processus *s_et	Line 996 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur)	if (sqlite3_prepare_v2((*descripteur)
.descripteur_sqlite,	.descripteur_sqlite, commande,
commande, strlen(commande), &ppStmt, &queue)	(int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1005 instruction_write(struct_processus *s_et	Line 1021 instruction_write(struct_processus *s_et

free(commande);	free(commande);

if (alsprintf(&commande, "select id from key "	if (alsprintf(s_etat_processus, &commande,
"where key = '%s'", clef_utf8) < 0)	"select id from key where key = '%s'",
	clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1014 instruction_write(struct_processus *s_et	Line 1031 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur)	if (sqlite3_prepare_v2((*descripteur)
.descripteur_sqlite,	.descripteur_sqlite, commande,
commande, strlen(commande), &ppStmt, &queue)	(int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1069 instruction_write(struct_processus *s_et	Line 1086 instruction_write(struct_processus *s_et

if (mise_a_jour == d_vrai)	if (mise_a_jour == d_vrai)
{	{
if (alsprintf(&commande, "update key set key = '%s' where "	if (alsprintf(s_etat_processus, &commande,
"id = %lld", clef_utf8, id) < 0)	"update key set key = '%s' where id = %lld",
	clef_utf8, id) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1078 instruction_write(struct_processus *s_et	Line 1096 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1105 instruction_write(struct_processus *s_et	Line 1123 instruction_write(struct_processus *s_et

// Effacement de l'enregistrement existant	// Effacement de l'enregistrement existant

if (alsprintf(&commande, "delete from data where "	if (alsprintf(s_etat_processus, &commande,
"key_id = %lld", id) < 0)	"delete from data where key_id = %lld", id) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1114 instruction_write(struct_processus *s_et	Line 1132 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
Line 1240 instruction_write(struct_processus *s_et	Line 1258 instruction_write(struct_processus *s_et

free(chaine);	free(chaine);

if (alsprintf(&commande, "insert into data "	if (alsprintf(s_etat_processus, &commande,
"(data, key_id, sequence) values "	"insert into data (data, key_id, sequence) values "
"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)	"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1250 instruction_write(struct_processus *s_et	Line 1268 instruction_write(struct_processus *s_et
}	}

if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,	if (sqlite3_prepare_v2((*descripteur).descripteur_sqlite,
commande, strlen(commande), &ppStmt, &queue)	commande, (int) strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1343 instruction_write(struct_processus *s_et	Line 1361 instruction_write(struct_processus *s_et
return;	return;
}	}

if (fwrite(chaine, sizeof(unsigned char), longueur_effective,	if (fwrite(chaine, sizeof(unsigned char),
	(size_t) longueur_effective,
(*descripteur).descripteur_c) !=	(*descripteur).descripteur_c) !=
(size_t) longueur_effective)	(size_t) longueur_effective)
{	{
Line 1479 instruction_write(struct_processus *s_et	Line 1498 instruction_write(struct_processus *s_et
return;	return;
}	}

if ((format_chaine = conversion_majuscule((unsigned char *)	if ((format_chaine = conversion_majuscule(s_etat_processus,
((l_element_courant_format).donnee).objet))	(unsigned char ) ((*l_element_courant_format)
== NULL)	.donnee).objet)) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1500 instruction_write(struct_processus *s_et	Line 1519 instruction_write(struct_processus *s_et
return;	return;
}	}

longueur = strlen(format_chaine);	longueur = (integer8) strlen(format_chaine);

if (format_chaine[longueur - 1] != ')')	if (format_chaine[longueur - 1] != ')')
{	{
Line 1525 instruction_write(struct_processus *s_et	Line 1544 instruction_write(struct_processus *s_et
// Détermination de la longueur	// Détermination de la longueur
format_degenere = d_faux;	format_degenere = d_faux;

if (sscanf(&(format_chaine[8]), "%ld", &longueur) != 1)	if (sscanf(&(format_chaine[8]), "%lld", &longueur) != 1)
{	{
free(format_chaine);	free(format_chaine);

Line 1553 instruction_write(struct_processus *s_et	Line 1572 instruction_write(struct_processus *s_et
(longueur_effective < longueur))	(longueur_effective < longueur))
{	{
if (fwrite(chaine, sizeof(unsigned char),	if (fwrite(chaine, sizeof(unsigned char),
longueur_effective,	(size_t) longueur_effective,
(*descripteur).descripteur_c) !=	(*descripteur).descripteur_c) !=
(size_t) longueur_effective)	(size_t) longueur_effective)
{	{
Line 1565 instruction_write(struct_processus *s_et	Line 1584 instruction_write(struct_processus *s_et
else	else
{	{
if (fwrite(chaine, sizeof(unsigned char),	if (fwrite(chaine, sizeof(unsigned char),
longueur_effective,	(size_t) longueur_effective,
(*descripteur).descripteur_c) !=	(*descripteur).descripteur_c) !=
(size_t) longueur)	(size_t) longueur)
{	{
Line 1716 instruction_write(struct_processus *s_et	Line 1735 instruction_write(struct_processus *s_et
}	}

if (send((((struct_socket ) (*s_objet_argument_1).objet))	if (send((((struct_socket ) (*s_objet_argument_1).objet))
.socket, chaine, longueur_effective, 0) < 0)	.socket, chaine, (size_t) longueur_effective, 0) < 0)
{	{
ios = errno;	ios = errno;

Line 1819 instruction_write(struct_processus *s_et	Line 1838 instruction_write(struct_processus *s_et

if (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
longueur_effective, 0, (struct sockaddr *)	(size_t) longueur_effective, 0, (struct sockaddr *)
&adresse_unix, sizeof(adresse_unix)) < 0)	&adresse_unix, sizeof(adresse_unix)) < 0)
{	{
ios = errno;	ios = errno;
Line 1880 instruction_write(struct_processus *s_et	Line 1899 instruction_write(struct_processus *s_et
{ // Adresse IPv4	{ // Adresse IPv4
calcul_adresse = 0;	calcul_adresse = 0;
for(i = 0; i < 4; calcul_adresse =	for(i = 0; i < 4; calcul_adresse =
(256 * calcul_adresse) + adresse[i++]);	(256 * calcul_adresse) +
	((unsigned char) adresse[i++]));

memset(&adresse_ipv4, 0, sizeof(adresse_ipv4));	memset(&adresse_ipv4, 0, sizeof(adresse_ipv4));
adresse_ipv4.sin_family = AF_INET;	adresse_ipv4.sin_family = AF_INET;
adresse_ipv4.sin_port = htons(port);	adresse_ipv4.sin_port = htons((uint16_t) port);
adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);	adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
Line 1900 instruction_write(struct_processus *s_et	Line 1920 instruction_write(struct_processus *s_et

if (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
longueur_effective, 0, (struct sockaddr *)	(size_t) longueur_effective, 0, (struct sockaddr *)
&adresse_ipv4, sizeof(adresse_ipv4)) < 0)	&adresse_ipv4, sizeof(adresse_ipv4)) < 0)
{	{
ios = errno;	ios = errno;
Line 1984 instruction_write(struct_processus *s_et	Line 2004 instruction_write(struct_processus *s_et

for(i = 0; i < 16;	for(i = 0; i < 16;
adresse_ipv6.sin6_addr.s6_addr[i] =	adresse_ipv6.sin6_addr.s6_addr[i] =
adresse[i], i++);	(unsigned char) adresse[i], i++);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork))	if (sem_post(&((*s_etat_processus).semaphore_fork))
Line 1999 instruction_write(struct_processus *s_et	Line 2019 instruction_write(struct_processus *s_et

if (sendto((((struct_socket )	if (sendto((((struct_socket )
(*s_objet_argument_1).objet)).socket, chaine,	(*s_objet_argument_1).objet)).socket, chaine,
longueur_effective, 0, (struct sockaddr *)	(size_t) longueur_effective, 0, (struct sockaddr *)
&adresse_ipv6, sizeof(adresse_ipv6)) < 0)	&adresse_ipv6, sizeof(adresse_ipv6)) < 0)
{	{
ios = errno;	ios = errno;
Line 2195 instruction_wflock(struct_processus *s_e	Line 2215 instruction_wflock(struct_processus *s_e

do	do
{	{
if ((chaine = conversion_majuscule((unsigned char *)	if ((chaine = conversion_majuscule(s_etat_processus,
(*s_objet_argument_1).objet)) == NULL)	(unsigned char ) (s_objet_argument_1).objet)) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
Line 2277 instruction_wflock(struct_processus *s_e	Line 2297 instruction_wflock(struct_processus *s_e
}	}
else	else
{	{
	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if ((*s_etat_processus).nombre_interruptions_en_queue	if (pthread_mutex_unlock(&(*s_etat_processus)
!= 0)	.mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
(*s_etat_processus).instruction_valide;	(*s_etat_processus).instruction_valide;
Line 2397 instruction_wfproc(struct_processus *s_e	Line 2430 instruction_wfproc(struct_processus *s_e
}	}
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2462 instruction_wfproc(struct_processus *s_e	Line 2496 instruction_wfproc(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2487 instruction_wfproc(struct_processus *s_e	Line 2522 instruction_wfproc(struct_processus *s_e
{	{
if (envoi_signal_processus(((((struct_processus_fils *)	if (envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread).pid,	((l_element_courant).donnee).objet)).thread).pid,
rpl_signull) != 0)	rpl_signull, d_faux) != 0)
{	{
drapeau_fin = d_vrai;	drapeau_fin = d_vrai;
}	}
Line 2542 instruction_wfproc(struct_processus *s_e	Line 2577 instruction_wfproc(struct_processus *s_e
* Le processus n'est pas terminé	* Le processus n'est pas terminé
*/	*/

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_interruptions)) != 0)
{	{
	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
Line 2560 instruction_wfproc(struct_processus *s_e	Line 2599 instruction_wfproc(struct_processus *s_e
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if ((*s_etat_processus).nombre_interruptions_en_queue	if (pthread_mutex_unlock(&((*s_etat_processus)
!= 0)	.mutex_interruptions)) != 0)
	{
	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
	{
	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
(*s_etat_processus).instruction_valide;	(*s_etat_processus).instruction_valide;
Line 2600 instruction_wfproc(struct_processus *s_e	Line 2667 instruction_wfproc(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2622 instruction_wfproc(struct_processus *s_e	Line 2690 instruction_wfproc(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2725 instruction_wfdata(struct_processus *s_e	Line 2794 instruction_wfdata(struct_processus *s_e
}	}
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2785 instruction_wfdata(struct_processus *s_e	Line 2855 instruction_wfdata(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2828 instruction_wfdata(struct_processus *s_e	Line 2899 instruction_wfdata(struct_processus *s_e
return;	return;
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2869 instruction_wfdata(struct_processus *s_e	Line 2941 instruction_wfdata(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

	if (pthread_mutex_lock(&(*s_etat_processus)
	.mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees	if ((*s_etat_processus).nombre_interruptions_non_affectees
!= 0)	!= 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&(*s_etat_processus)
	.mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_en_queue != 0)	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
Line 2894 instruction_wfdata(struct_processus *s_e	Line 2980 instruction_wfdata(struct_processus *s_e
return;	return;
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2921 instruction_wfdata(struct_processus *s_e	Line 3008 instruction_wfdata(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 2953 instruction_wfdata(struct_processus *s_e	Line 3041 instruction_wfdata(struct_processus *s_e
================================================================================	================================================================================
*/	*/

	static inline logical1
	options_sockets(struct_processus s_etat_processus, struct_socket s_socket)
	{
	int drapeau;

	if (((*s_socket).options & (1 << d_BROADCAST)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_BROADCAST, &drapeau,
	sizeof(drapeau)) != 0)
	{
	return(d_erreur);
	}
	}

	if (((*s_socket).options & (1 << d_DONT_ROUTE)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_DONTROUTE, &drapeau,
	sizeof(drapeau)) != 0)
	{
	return(d_erreur);
	}
	}

	if (((*s_socket).options & (1 << d_KEEP_ALIVE)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_KEEPALIVE, &drapeau,
	sizeof(drapeau)) != 0)
	{
	return(d_erreur);
	}
	}

	# ifdef SO_PRIORITY
	if (((*s_socket).options & (1 << d_PRIORITY)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_PRIORITY,
	&((s_socket).priorite), sizeof((s_socket).priorite)) != 0)
	{
	return(d_erreur);
	}
	}
	# endif

	// Les deux options suivantes ne peuvent être positionnées simultanément.

	if (((*s_socket).options & (1 << d_RECEIVE_BUFFER)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_RCVBUF,
	&((*s_socket).buffer_reception),
	sizeof((*s_socket).buffer_reception)) != 0)
	{
	return(d_erreur);
	}
	}

	# ifdef SO_RCVBUFFORCE
	if (((*s_socket).options & (1 << d_FORCE_RECEIVE_BUFFER)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_RCVBUFFORCE,
	&((*s_socket).buffer_reception),
	sizeof((*s_socket).buffer_reception)) != 0)
	{
	return(d_erreur);
	}
	}
	# endif

	// Même remarque

	if (((*s_socket).options & (1 << d_SEND_BUFFER)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_SNDBUF,
	&((*s_socket).buffer_emission),
	sizeof((*s_socket).buffer_emission)) != 0)
	{
	return(d_erreur);
	}
	}

	# ifdef SO_SNDBUFFORCE
	if (((*s_socket).options & (1 << d_FORCE_SEND_BUFFER)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_SNDBUFFORCE,
	&((*s_socket).buffer_emission),
	sizeof((*s_socket).buffer_emission)) != 0)
	{
	return(d_erreur);
	}
	}
	# endif

	if (((*s_socket).options & (1 << d_RECEIVING_TIMEOUT)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_RCVTIMEO,
	&((*s_socket).timeout_emission),
	sizeof((*s_socket).timeout_emission)) != 0)
	{
	return(d_erreur);
	}
	}

	if (((*s_socket).options & (1 << d_SENDING_TIMEOUT)) != 0)
	{
	if (setsockopt((*s_socket).socket, SOL_SOCKET, SO_SNDTIMEO,
	&((*s_socket).timeout_emission),
	sizeof((*s_socket).timeout_emission)) != 0)
	{
	return(d_erreur);
	}
	}

	return(d_absence_erreur);;
	}


void	void
instruction_wfsock(struct_processus *s_etat_processus)	instruction_wfsock(struct_processus *s_etat_processus)
{	{
Line 3138 instruction_wfsock(struct_processus *s_e	Line 3341 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork))	if (sem_post(&((*s_etat_processus).semaphore_fork))
!= 0)	!= 0)
# else	# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3158 instruction_wfsock(struct_processus *s_e	Line 3361 instruction_wfsock(struct_processus *s_e
erreur = errno;	erreur = errno;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 3196 instruction_wfsock(struct_processus *s_e	Line 3399 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3211 instruction_wfsock(struct_processus *s_e	Line 3414 instruction_wfsock(struct_processus *s_e
return;	return;
}	}
}	}

	if (options_sockets(s_etat_processus,
	(*s_objet_resultat).objet) != d_absence_erreur)
	{
	liberation(s_etat_processus, s_objet_argument);
	liberation(s_etat_processus, s_objet_resultat);

	(*s_etat_processus).erreur_execution =
	d_ex_erreur_parametre_fichier;
	return;
	}
}	}
} while(drapeau == d_faux);	} while(drapeau == d_faux);

Line 3241 instruction_wfsock(struct_processus *s_e	Line 3455 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork))	if (sem_post(&((*s_etat_processus).semaphore_fork))
!= 0)	!= 0)
# else	# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3259 instruction_wfsock(struct_processus *s_e	Line 3473 instruction_wfsock(struct_processus *s_e
{	{
erreur = errno;	erreur = errno;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3298 instruction_wfsock(struct_processus *s_e	Line 3512 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3313 instruction_wfsock(struct_processus *s_e	Line 3527 instruction_wfsock(struct_processus *s_e
return;	return;
}	}
}	}

	if (options_sockets(s_etat_processus,
	(*s_objet_resultat).objet) != d_absence_erreur)
	{
	liberation(s_etat_processus, s_objet_argument);
	liberation(s_etat_processus, s_objet_resultat);

	(*s_etat_processus).erreur_execution =
	d_ex_erreur_parametre_fichier;
	return;
	}
}	}
} while(drapeau == d_faux);	} while(drapeau == d_faux);

Line 3363 instruction_wfsock(struct_processus *s_e	Line 3588 instruction_wfsock(struct_processus *s_e
{	{
drapeau = d_vrai;	drapeau = d_vrai;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork))	if (sem_post(&((*s_etat_processus).semaphore_fork))
!= 0)	!= 0)
# else	# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3381 instruction_wfsock(struct_processus *s_e	Line 3606 instruction_wfsock(struct_processus *s_e
{	{
erreur = errno;	erreur = errno;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3420 instruction_wfsock(struct_processus *s_e	Line 3645 instruction_wfsock(struct_processus *s_e
}	}
else	else
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork)	while(sem_wait((*s_etat_processus).semaphore_fork)
!= 0)	!= 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3435 instruction_wfsock(struct_processus *s_e	Line 3660 instruction_wfsock(struct_processus *s_e
return;	return;
}	}
}	}

	if (options_sockets(s_etat_processus,
	(*s_objet_resultat).objet) != d_absence_erreur)
	{
	liberation(s_etat_processus, s_objet_argument);
	liberation(s_etat_processus, s_objet_resultat);

	(*s_etat_processus).erreur_execution =
	d_ex_erreur_parametre_fichier;
	return;
	}
}	}
} while(drapeau == d_faux);	} while(drapeau == d_faux);
}	}
Line 3605 instruction_wfswi(struct_processus *s_et	Line 3841 instruction_wfswi(struct_processus *s_et
return;	return;
}	}

	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0)	if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0)
{	{
drapeau_fin = d_vrai;	drapeau_fin = d_vrai;
Line 3742 instruction_wfpoke(struct_processus *s_e	Line 3992 instruction_wfpoke(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_en_queue != 0)	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
Line 3849 instruction_wfack(struct_processus *s_et	Line 4111 instruction_wfack(struct_processus *s_et
{	{
scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if ((*s_etat_processus).nombre_interruptions_en_queue != 0)	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.78
changed lines
	Added in v.1.106