rpl/src/rpl.h - diff

Return to rpl.h CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.h between versions 1.224 and 1.242

version 1.224, 2013/05/23 09:20:08	version 1.242, 2014/04/29 14:41:43
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.18
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2014 Dr. BERTRAND Joël

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

Line 56	Line 56
# define sched_yield(arg)	# define sched_yield(arg)
#endif	#endif

	#ifdef CYGWIN
	# define SA_ONSTACK 0
	#endif


/*	/*
================================================================================	================================================================================
Line 142	Line 146
# define SEM_FAILED NULL	# define SEM_FAILED NULL
# endif	# endif

sem_t sem_open_SysV(const char nom, int oflag, ...);	# ifndef __RPLCAS
int sem_init_SysV(sem_t *sem, int shared, unsigned int value);	sem_t sem_open_SysV(const char nom, int oflag, ...);
int sem_close_SysV(sem_t *sem);	int sem_init_SysV(sem_t *sem, int shared, unsigned int value);
int sem_wait_SysV(sem_t *sem);	int sem_close_SysV(sem_t *sem);
int sem_trywait_SysV(sem_t *sem);	int sem_wait_SysV(sem_t *sem);
int sem_timedwait_SysV(sem_t sem, struct timespec ts);	int sem_trywait_SysV(sem_t *sem);
int sem_post_SysV(sem_t *sem);	int sem_timedwait_SysV(sem_t sem, struct timespec ts);
int sem_getvalue_SysV(sem_t sem, int value);	int sem_post_SysV(sem_t *sem);
int sem_unlink_SysV(char *nom);	int sem_getvalue_SysV(sem_t sem, int value);
int sem_destroy_SysV(sem_t *sem);	int sem_unlink_SysV(char *nom);
	int sem_destroy_SysV(sem_t *sem);
	# endif
# endif	# endif

# include <setjmp.h>	# include <setjmp.h>
Line 314 enum signaux_rpl	Line 320 enum signaux_rpl
#ifndef RPLARGS	#ifndef RPLARGS
typedef struct queue_signaux	typedef struct queue_signaux
{	{
# ifndef IPCS_SYSV
# ifndef SEMAPHORES_NOMMES
sem_t semaphore;
sem_t signalisation;
sem_t arret_signalisation;
# endif
# else
sem_t semaphore;
sem_t signalisation;
sem_t arret_signalisation;
# endif

volatile int pointeur_lecture;	volatile int pointeur_lecture;
volatile int pointeur_ecriture;	volatile int pointeur_ecriture;
pthread_t thread_signaux;
volatile logical1 requete_arret;	volatile logical1 requete_arret;

	pthread_t thread_signaux;

volatile struct	volatile struct
{	{
pid_t pid;	pid_t pid;
enum signaux_rpl signal;	enum signaux_rpl signal;
} queue[LONGUEUR_QUEUE_SIGNAUX];	} queue[LONGUEUR_QUEUE_SIGNAUX];

	# ifdef OS2
	sem_t semaphore;
	sem_t signalisation;
	sem_t arret_signalisation;
	# endif
} struct_queue_signaux;	} struct_queue_signaux;

__EXTERN__ struct_queue_signaux *s_queue_signaux;	__EXTERN__ struct_queue_signaux *s_queue_signaux;
__EXTERN__ int f_queue_signaux;	__EXTERN__ int f_queue_signaux;

# ifdef SEMAPHORES_NOMMES	# ifndef OS2
__EXTERN__ sem_t *semaphore_queue_signaux;	__EXTERN__ sem_t *semaphore_queue_signaux;
__EXTERN__ sem_t *semaphore_signalisation;	__EXTERN__ sem_t *semaphore_signalisation;
__EXTERN__ sem_t *semaphore_arret_signalisation;	__EXTERN__ sem_t *semaphore_arret_signalisation;
# endif	# endif
#endif	#endif

Line 458 union semun	Line 459 union semun
#ifndef RPLARGS	#ifndef RPLARGS
# ifdef SEMAPHORES_NOMMES	# ifdef SEMAPHORES_NOMMES
# define LONGUEUR_NOM_SEMAPHORE 64	# define LONGUEUR_NOM_SEMAPHORE 64
# endif

# ifdef SEMAPHORES_NOMMES
# define __PTR__ *	# define __PTR__ *
# else	# else
# define __PTR__	# define __PTR__
Line 476 union semun	Line 474 union semun

__EXTERN__ pid_t pid_processus_pere;	__EXTERN__ pid_t pid_processus_pere;

# ifdef SEMAPHORES_NOMMES
__EXTERN__ pthread_mutex_t mutex_sem __STATIC_MUTEX_INITIALIZATION__;
# endif

__EXTERN__ pthread_mutex_t mutex_liste_threads	__EXTERN__ pthread_mutex_t mutex_liste_threads
__STATIC_MUTEX_INITIALIZATION__;	__STATIC_MUTEX_INITIALIZATION__;
__EXTERN__ pthread_mutex_t mutex_gestionnaires_signaux_atomique
__STATIC_MUTEX_INITIALIZATION__;
__EXTERN__ pthread_mutex_t mutex_creation_variable_partagee	__EXTERN__ pthread_mutex_t mutex_creation_variable_partagee
__STATIC_MUTEX_INITIALIZATION__;	__STATIC_MUTEX_INITIALIZATION__;
__EXTERN__ pthread_mutex_t mutex_sections_critiques;	__EXTERN__ pthread_mutex_t mutex_sections_critiques;
__EXTERN__ pthread_mutex_t mutex_liste_variables_partagees;	__EXTERN__ pthread_mutex_t mutex_liste_variables_partagees;
	__EXTERN__ pthread_mutex_t mutex_sem __STATIC_MUTEX_INITIALIZATION__;

__EXTERN__ sem_t __PTR__ semaphore_gestionnaires_signaux;	__EXTERN__ sem_t __PTR__ semaphore_gestionnaires_signaux;

__EXTERN__ volatile int routine_recursive;	__EXTERN__ volatile int routine_recursive;
#endif	#endif

#ifdef SEMAPHORES_NOMMES
#define SEM_FORK 0	#define SEM_FORK 0
#define SEM_QUEUE 1	#define SEM_QUEUE 1
#define SEM_SIGNAUX 2	#define SEM_SIGNAUX 2
Line 511 sem_t *sem_open2(pid_t pid, int ordre);	Line 503 sem_t *sem_open2(pid_t pid, int ordre);
// de sem_getvalue() sur un système comme MacOS X qui ne possède pas	// de sem_getvalue() sur un système comme MacOS X qui ne possède pas
// cette fonction.	// cette fonction.

	#ifdef Darwin
#define sem_getvalue(semaphore, value) sem_getvalue2(semaphore, value)	#define sem_getvalue(semaphore, value) sem_getvalue2(semaphore, value)
#define sem_post(semaphore) \	#define sem_post(semaphore) \
({ int r; pthread_mutex_lock(&mutex_sem); \	({ int r; pthread_mutex_lock(&mutex_sem); \
Line 2309 typedef struct processus	Line 2302 typedef struct processus
struct_liste_profilage2 *pile_profilage_fonctions;	struct_liste_profilage2 *pile_profilage_fonctions;
struct timeval horodatage_profilage;	struct timeval horodatage_profilage;

// Mutex spécifique au processus et donnant accès à la pile des processus
pthread_mutex_t mutex;
pthread_mutex_t mutex_allocation;	pthread_mutex_t mutex_allocation;
	pthread_mutex_t mutex_interruptions;
	pthread_mutex_t mutex_pile_processus;
	pthread_mutex_t mutex_signaux;

// Mutex autorisant les fork()	// Mutex autorisant les fork()
sem_t __PTR__ semaphore_fork;	sem_t __PTR__ semaphore_fork;
Line 2801 void instruction_return(struct_processus	Line 2795 void instruction_return(struct_processus
void instruction_revlist(struct_processus *s_etat_processus);	void instruction_revlist(struct_processus *s_etat_processus);
void instruction_rewind(struct_processus *s_etat_processus);	void instruction_rewind(struct_processus *s_etat_processus);
void instruction_rfuse(struct_processus *s_etat_processus);	void instruction_rfuse(struct_processus *s_etat_processus);
	void instruction_rgdl(struct_processus *s_etat_processus);
	void instruction_rgdr(struct_processus *s_etat_processus);
void instruction_rl(struct_processus *s_etat_processus);	void instruction_rl(struct_processus *s_etat_processus);
void instruction_rlb(struct_processus *s_etat_processus);	void instruction_rlb(struct_processus *s_etat_processus);
void instruction_rnd(struct_processus *s_etat_processus);	void instruction_rnd(struct_processus *s_etat_processus);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.224
changed lines
	Added in v.1.242