rpl/src/semaphores.c - diff

Return to semaphores.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/semaphores.c between versions 1.44 and 1.70

version 1.44, 2012/04/13 14:13:04	version 1.70, 2015/06/08 14:11:45
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.8	RPL/2 (R) version 4.1.22
Copyright (C) 1989-2012 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 23	Line 23
#include "rpl-conv.h"	#include "rpl-conv.h"


#ifdef SEMAPHORES_NOMMES

// Les fonctions suivantes ne sont utilisées que dans le cas d'un	// Les fonctions suivantes ne sont utilisées que dans le cas d'un
// système POSIX qui ne possède pas de sémaphores anonymes. MacOS X	// système POSIX qui ne possède pas de sémaphores anonymes. MacOS X
// est dans ce cas.	// est dans ce cas.
Line 34 nom_segment_semaphore(pid_t pid, int ord	Line 32 nom_segment_semaphore(pid_t pid, int ord
{	{
unsigned char *fichier;	unsigned char *fichier;

if ((fichier = malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)	if ((fichier = sys_malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)
{	{
return(NULL);	return(NULL);
}	}

sprintf(fichier, "/RPL-%d-%d", (int) pid, ordre);	sprintf(fichier, "/RPL-%llu-%d", (unsigned long long) pid, ordre);
return(fichier);	return(fichier);
}	}

Line 49 nom_segment_semaphore_thread(pid_t pid,	Line 47 nom_segment_semaphore_thread(pid_t pid,
{	{
unsigned char *fichier;	unsigned char *fichier;

if ((fichier = malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)	if ((fichier = sys_malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)
{	{
return(NULL);	return(NULL);
}	}

sprintf(fichier, "/RPL-%d-%llX-%d", (int) pid,	sprintf(fichier, "/RPL-%llu-%llu-%d", (unsigned long long) pid,
(unsigned long long) tid, ordre);	(unsigned long long) tid, ordre);
return(fichier);	return(fichier);
}	}
Line 86 sem_init2(unsigned int valeur, pid_t pid	Line 84 sem_init2(unsigned int valeur, pid_t pid

semaphore = sem_open(chemin, O_RDWR \| O_CREAT \| O_EXCL, S_IRUSR \| S_IWUSR,	semaphore = sem_open(chemin, O_RDWR \| O_CREAT \| O_EXCL, S_IRUSR \| S_IWUSR,
valeur);	valeur);
free(chemin);	sys_free(chemin);

return(semaphore);	return(semaphore);
}	}
Line 106 sem_init3(unsigned int valeur, pid_t pid	Line 104 sem_init3(unsigned int valeur, pid_t pid

semaphore = sem_open(chemin, O_CREAT \| O_EXCL \| O_RDWR, S_IRUSR \| S_IWUSR,	semaphore = sem_open(chemin, O_CREAT \| O_EXCL \| O_RDWR, S_IRUSR \| S_IWUSR,
valeur);	valeur);
free(chemin);	sys_free(chemin);

return(semaphore);	return(semaphore);
}	}
Line 125 sem_open2(pid_t pid, int ordre)	Line 123 sem_open2(pid_t pid, int ordre)
}	}

semaphore = sem_open(chemin, O_RDWR);	semaphore = sem_open(chemin, O_RDWR);
free(chemin);	sys_free(chemin);

return(semaphore);	return(semaphore);
}	}
Line 146 sem_destroy2(sem_t *semaphore, pid_t pid	Line 144 sem_destroy2(sem_t *semaphore, pid_t pid
}	}

erreur = sem_unlink(chemin);	erreur = sem_unlink(chemin);
free(chemin);	sys_free(chemin);

return(erreur);	return(erreur);
}	}
Line 167 sem_destroy3(sem_t *semaphore, pid_t pid	Line 165 sem_destroy3(sem_t *semaphore, pid_t pid
}	}

erreur = sem_unlink(chemin);	erreur = sem_unlink(chemin);
free(chemin);	sys_free(chemin);

return(erreur);	return(erreur);
}	}


#undef sem_post
#undef sem_wait
#undef sem_trywait

int	int
sem_getvalue2(sem_t semaphore, int valeur)	sem_getvalue2(sem_t semaphore, int valeur)
{	{
Line 242 sem_getvalue2(sem_t semaphore, int val	Line 236 sem_getvalue2(sem_t semaphore, int val
return(0);	return(0);
}	}

#endif
	#undef sem_post
	#undef sem_wait
	#undef sem_trywait


#ifdef IPCS_SYSV	#ifdef IPCS_SYSV

Line 292 sem_init_SysV(sem_t *semaphore, int shar	Line 290 sem_init_SysV(sem_t *semaphore, int shar
else	else
{	{
// Sémaphore partagé entre plusieurs processus	// Sémaphore partagé entre plusieurs processus
if (((*semaphore).path = malloc((strlen(racine_segment)	if (((*semaphore).path = sys_malloc((strlen(racine_segment)
+ 2 + 256 + 1) * sizeof(unsigned char))) == NULL)	+ 2 + 256 + 1) * sizeof(unsigned char))) == NULL)
{	{
return(-1);	return(-1);
}	}

sprintf((*semaphore).path, "%s/RPL-SEMAPHORE-%d-%llX-%d",	sprintf((*semaphore).path, "%s/RPL-SEMAPHORE-%d-%llX-%llX",
racine_segment, (int) getpid(), pthread_self(), shared);	racine_segment, (int) getpid(),
	(long long unsigned) pthread_self(),
	(long long unsigned) semaphore);

if ((desc = open((*semaphore).path, O_RDWR \| O_CREAT \| O_EXCL,	if ((desc = open((*semaphore).path, O_RDWR \| O_CREAT \| O_EXCL,
S_IRUSR \| S_IWUSR)) == -1)	S_IRUSR \| S_IWUSR)) == -1)
{	{
free((*semaphore).path);	sys_free((*semaphore).path);
return(-1);	return(-1);
}	}

Line 315 sem_init_SysV(sem_t *semaphore, int shar	Line 315 sem_init_SysV(sem_t *semaphore, int shar

if (clef == -1)	if (clef == -1)
{	{
free((*semaphore).path);	sys_free((*semaphore).path);
return(-1);	return(-1);
}	}

Line 330 sem_init_SysV(sem_t *semaphore, int shar	Line 330 sem_init_SysV(sem_t *semaphore, int shar
return(-1);	return(-1);
}	}

argument.val = valeur;	argument.val = (int) valeur;
ios = semctl((*semaphore).sem, 0, SETVAL, argument);	ios = semctl((*semaphore).sem, 0, SETVAL, argument);

return(ios);	return(ios);
Line 339 sem_init_SysV(sem_t *semaphore, int shar	Line 339 sem_init_SysV(sem_t *semaphore, int shar

psem = semaphore;	psem = semaphore;

if (((*psem).cnt = malloc(sizeof(ULONG))) == NULL)	if (((*psem).cnt = sys_malloc(sizeof(ULONG))) == NULL)
{	{
free(psem);	sys_free(psem);
errno = ENOMEM;	errno = ENOMEM;
return(-1);	return(-1);
}	}

if (((*psem).nopened = malloc(sizeof(ULONG))) == NULL)	if (((*psem).nopened = sys_malloc(sizeof(ULONG))) == NULL)
{	{
free((*psem).cnt);	sys_free((*psem).cnt);
free(psem);	sys_free(psem);
errno = ENOMEM;	errno = ENOMEM;
return(-1);	return(-1);
}	}

if (DosCreateMutexSem(NULL, &((*psem).hmtx), 0, 0) != 0)	if (DosCreateMutexSem(NULL, &((*psem).hmtx), 0, 0) != 0)
{	{
free((*psem).cnt);	sys_free((*psem).cnt);
free((*psem).nopened);	sys_free((*psem).nopened);
free(psem);	sys_free(psem);
return(-1);	return(-1);
}	}

Line 366 sem_init_SysV(sem_t *semaphore, int shar	Line 366 sem_init_SysV(sem_t *semaphore, int shar
!= 0)	!= 0)
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);
free((*psem).cnt);	sys_free((*psem).cnt);
free((*psem).nopened);	sys_free((*psem).nopened);
free(psem);	sys_free(psem);
return(-1);	return(-1);
}	}

Line 427 sem_destroy_SysV(sem_t *semaphore)	Line 427 sem_destroy_SysV(sem_t *semaphore)

if ((*psem).shared == 0)	if ((*psem).shared == 0)
{	{
free((*psem).cnt);	sys_free((*psem).cnt);
free((*psem).nopened);	sys_free((*psem).nopened);
}	}
else	else
{	{
Line 440 sem_destroy_SysV(sem_t *semaphore)	Line 440 sem_destroy_SysV(sem_t *semaphore)

if ((*psem).allocated != 0)	if ((*psem).allocated != 0)
{	{
free(psem);	sys_free(psem);
}	}

return(0);	return(0);
Line 453 sem_wait_SysV(sem_t *semaphore)	Line 453 sem_wait_SysV(sem_t *semaphore)
# ifndef OS2 // IPCS_SYSV	# ifndef OS2 // IPCS_SYSV
struct sembuf commande;	struct sembuf commande;

	// semop() ne renvoie pas EINTR sur un signal !

commande.sem_num = 0;	commande.sem_num = 0;
commande.sem_op = -1;	commande.sem_op = -1;
commande.sem_flg = 0;	commande.sem_flg = 0;

while(semop((*semaphore).sem, &commande, 1) == -1)	if (semop((*semaphore).sem, &commande, 1) == -1)
{	{
if (errno != EINTR)	if (errno != EAGAIN)
{	{
errno = EINVAL;	errno = EINVAL;
return(-1);	return(-1);
}	}
	else
	{
	return(-1);
	}
}	}

return(0);	return(0);
Line 511 sem_trywait_SysV(sem_t *semaphore)	Line 517 sem_trywait_SysV(sem_t *semaphore)
commande.sem_op = -1;	commande.sem_op = -1;
commande.sem_flg = IPC_NOWAIT;	commande.sem_flg = IPC_NOWAIT;

while(semop((*semaphore).sem, &commande, 1) == -1)	if (semop((*semaphore).sem, &commande, 1) == -1)
{	{
if (errno != EINTR)	return(-1);
{
errno = EINVAL;
return(-1);
}
}	}

return(0);	return(0);
Line 557 sem_trywait_SysV(sem_t *semaphore)	Line 559 sem_trywait_SysV(sem_t *semaphore)
# endif	# endif
}	}

	#ifndef timespeccmp
	# define timespeccmp(tsp, usp, cmp) \
	(((tsp)->tv_sec == (usp)->tv_sec) ? \
	((tsp)->tv_nsec cmp (usp)->tv_nsec) : \
	((tsp)->tv_sec cmp (usp)->tv_sec))
	# define timespecadd(tsp, usp, vsp) \
	do { \
	(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec; \
	(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec; \
	if ((vsp)->tv_nsec >= 1000000000L) { \
	(vsp)->tv_sec++; \
	(vsp)->tv_nsec -= 1000000000L; \
	} \
	} while(0)
	# define timespecsub(tsp, usp, vsp) \
	do { \
	(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \
	(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \
	if ((vsp)->tv_nsec < 0) { \
	(vsp)->tv_sec--; \
	(vsp)->tv_nsec += 1000000000L; \
	} \
	} while(0)
	#endif

	int
	sem_timedwait_SysV(sem_t sem, struct timespec ts)
	{
	struct timespec onems = { 0, 1000000 };
	struct timespec total = { 0, 0 };
	struct timespec unslept;
	struct timespec elapsed;
	struct timespec tmp;

	while(timespeccmp(ts, &total, >))
	{
	if (sem_trywait_SysV(sem) == 0)
	{
	return(0);
	}

	if (errno != EAGAIN)
	{
	return(-1);
	}

	nanosleep(&onems, &unslept);

	timespecsub(&onems, &unslept, &elapsed);
	timespecadd(&total, &elapsed, &tmp);
	total.tv_sec = tmp.tv_sec;
	total.tv_nsec = tmp.tv_nsec;
	}

	errno = ETIMEDOUT;
	return(-1);
	}

int	int
sem_post_SysV(sem_t *semaphore)	sem_post_SysV(sem_t *semaphore)
{	{
Line 659 sem_t	Line 719 sem_t
# endif	# endif

# ifndef OS2 // IPCS_SYSV	# ifndef OS2 // IPCS_SYSV
if ((nom_absolu = malloc((strlen(racine_segment) + strlen(nom)	if ((nom_absolu = sys_malloc((strlen(racine_segment) + strlen(nom)
+ 2) * sizeof(unsigned char))) == NULL)	+ 2) * sizeof(unsigned char))) == NULL)
{	{
return(SEM_FAILED);	return(SEM_FAILED);
Line 667 sem_t	Line 727 sem_t

sprintf(nom_absolu, "%s/%s", racine_segment, nom);	sprintf(nom_absolu, "%s/%s", racine_segment, nom);

if ((semaphore = malloc(sizeof(sem_t))) == NULL)	if ((semaphore = sys_malloc(sizeof(sem_t))) == NULL)
{	{
return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 676 sem_t	Line 736 sem_t
(*semaphore).pid = getpid();	(*semaphore).pid = getpid();
(*semaphore).tid = pthread_self();	(*semaphore).tid = pthread_self();
# else	# else
if ((nom_segment = malloc((strlen(racine_memoire_OS2) + strlen(nom) + 1)	if ((nom_segment = sys_malloc((strlen(racine_memoire_OS2) + strlen(nom)
* sizeof(unsigned char))) == NULL)	+ 1) * sizeof(unsigned char))) == NULL)
{	{
return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 695 sem_t	Line 755 sem_t
ptr++;	ptr++;
}	}

if ((nom_absolu = malloc((strlen(racine_semaphores_OS2) + strlen(nom)	if ((nom_absolu = sys_malloc((strlen(racine_semaphores_OS2) +
+ 2) * sizeof(unsigned char))) == NULL)	strlen(nom) + 2) * sizeof(unsigned char))) == NULL)
{	{
return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 716 sem_t	Line 776 sem_t

(*(ptr + 1)) = d_code_fin_chaine;	(*(ptr + 1)) = d_code_fin_chaine;

if ((psem = malloc(sizeof(sem_t))) == NULL)	if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
{	{
return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 742 sem_t	Line 802 sem_t

if ((*semaphore).sem == -1)	if ((*semaphore).sem == -1)
{	{
free(semaphore);	sys_free(semaphore);
free(nom_absolu);	sys_free(nom_absolu);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
# else // OS/2	# else // OS/2
if ((psem = malloc(sizeof(sem_t))) == NULL)	if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
{	{
free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);
return(SEM_FAILED);	return(SEM_FAILED);
}	}

Line 759 sem_t	Line 819 sem_t

if (DosOpenMutexSem(nom_absolu, &((*psem).hmtx)) != 0)	if (DosOpenMutexSem(nom_absolu, &((*psem).hmtx)) != 0)
{	{
free(psem);	sys_free(psem);
free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 772 sem_t	Line 832 sem_t
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);

free(psem);	sys_free(psem);
free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 784 sem_t	Line 844 sem_t
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);

free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);
free(psem);	sys_free(psem);

return(SEM_FAILED);	return(SEM_FAILED);
}	}

free(nom_segment);	sys_free(nom_segment);

(psem).cnt = (ULONG ) base;	(psem).cnt = (ULONG ) base;
(psem).nopened = ((ULONG ) base) + 1;	(psem).nopened = ((ULONG ) base) + 1;
Line 801 sem_t	Line 861 sem_t
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);

free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);
free(psem);	sys_free(psem);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 831 sem_t	Line 891 sem_t
if ((desc = open(nom_absolu, O_CREAT \| O_EXCL \| O_RDWR,	if ((desc = open(nom_absolu, O_CREAT \| O_EXCL \| O_RDWR,
S_IRUSR \| S_IWUSR)) == -1)	S_IRUSR \| S_IWUSR)) == -1)
{	{
free(semaphore);	sys_free(semaphore);
free(nom_absolu);	sys_free(nom_absolu);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 840 sem_t	Line 900 sem_t
if ((clef = ftok(nom_absolu, 1)) == -1)	if ((clef = ftok(nom_absolu, 1)) == -1)
{	{
close(desc);	close(desc);
free(semaphore);	sys_free(semaphore);
free(nom_absolu);	sys_free(nom_absolu);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 857 sem_t	Line 917 sem_t

if ((*semaphore).sem == -1)	if ((*semaphore).sem == -1)
{	{
free(semaphore);	sys_free(semaphore);
free(nom_absolu);	sys_free(nom_absolu);

return(SEM_FAILED);	return(SEM_FAILED);
}	}

argument.val = valeur;	argument.val = (int) valeur;
semctl((*semaphore).sem, 0, SETVAL, argument);	semctl((*semaphore).sem, 0, SETVAL, argument);
# else // OS/2	# else // OS/2
if ((psem = malloc(sizeof(sem_t))) == NULL)	if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
{	{
free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 878 sem_t	Line 938 sem_t

if (DosCreateMutexSem(nom_absolu, &((*psem).hmtx), 0, 0) != 0)	if (DosCreateMutexSem(nom_absolu, &((*psem).hmtx), 0, 0) != 0)
{	{
free(psem);	sys_free(psem);
free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 892 sem_t	Line 952 sem_t
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);

free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);
free(psem);	sys_free(psem);

return(SEM_FAILED);	return(SEM_FAILED);
}	}
Line 904 sem_t	Line 964 sem_t
{	{
DosCloseMutexSem((*psem).hmtx);	DosCloseMutexSem((*psem).hmtx);

free(nom_absolu);	sys_free(nom_absolu);
free(nom_segment);	sys_free(nom_segment);
free(psem);	sys_free(psem);

return(SEM_FAILED);	return(SEM_FAILED);
}	}

free(nom_segment);	sys_free(nom_segment);

(psem).cnt = (ULONG ) base;	(psem).cnt = (ULONG ) base;
(psem).nopened = ((ULONG ) base) + 1;	(psem).nopened = ((ULONG ) base) + 1;
Line 932 sem_close_SysV(sem_t *semaphore)	Line 992 sem_close_SysV(sem_t *semaphore)
# ifndef OS2 // IPCS_SYSV	# ifndef OS2 // IPCS_SYSV
if ((*semaphore).path != NULL)	if ((*semaphore).path != NULL)
{	{
free((*semaphore).path);	sys_free((*semaphore).path);
}	}

if ((*semaphore).alloue == -1)	if ((*semaphore).alloue == -1)
{	{
free(semaphore);	sys_free(semaphore);
}	}

return(0);	return(0);
Line 960 sem_close_SysV(sem_t *semaphore)	Line 1020 sem_close_SysV(sem_t *semaphore)

if ((*psem).shared == 0)	if ((*psem).shared == 0)
{	{
free((*psem).cnt);	sys_free((*psem).cnt);
free((*psem).nopened);	sys_free((*psem).nopened);
}	}
else	else
{	{
Line 973 sem_close_SysV(sem_t *semaphore)	Line 1033 sem_close_SysV(sem_t *semaphore)

if ((*psem).allocated != 0)	if ((*psem).allocated != 0)
{	{
free(psem);	sys_free(psem);
}	}

return(0);	return(0);
Line 981 sem_close_SysV(sem_t *semaphore)	Line 1041 sem_close_SysV(sem_t *semaphore)
}	}

int	int
sem_unlink_SysV(const char *nom)	sem_unlink_SysV(char *nom)
{	{
// Détruit un sémaphore nommé créé par sem_open_SysV()	// Détruit un sémaphore nommé créé par sem_open_SysV()
# ifndef OS2 // IPCS_SYSV	# ifndef OS2 // IPCS_SYSV
Line 989 sem_unlink_SysV(const char *nom)	Line 1049 sem_unlink_SysV(const char *nom)

if (unlink(nom) == -1)	if (unlink(nom) == -1)
{	{
free(nom_absolu);
return(EACCES);	return(EACCES);
}	}

free(nom);	sys_free(nom);
return(0);	return(0);
# else	# else
return(0);	return(0);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.44
changed lines
	Added in v.1.70