glenux-school/l3.libnazgul
glenux-school/l3.libnazgul
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix variable names & use pthreads library

Browse source
This commit is contained in:
Glenn Y. Rolland 2019-09-17 14:39:18 +02:00
parent ac6631c427
commit f99f7ca60f
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nzg_allocate.c
View file

@ -23,8 +23,8 @@ void * msgAllocate(msgSpace *space,
float semPoolCoef[space->poolNb]; float semPoolCoef[space->poolNb];
int idxPoolOptimum; int idxPoolOptimum;
bool gotRessourceSem; bool gotRessourceSem;
sem_t * poolDataSemFd=NULL; sem_t * poolDataTabSemFd=NULL;
msgPoolDataSemId ressourceSemId; msgPoolDataTabSemId ressourceSemId;
sem_t * ressourceSemFd=NULL; sem_t * ressourceSemFd=NULL;
int * ressourceSemVal=NULL; int * ressourceSemVal=NULL;
float minPoolCoef; float minPoolCoef;
@ -33,10 +33,10 @@ void * msgAllocate(msgSpace *space,
selectedIdx=-1; selectedIdx=-1;
/* TODO: verifier le premier arg du shm_open */ /* TODO: verifier le premier arg du shm_open */
mSPoolDataTabFd=shm_open(space->poolDataId,O_RDWR,MSGSPACE_DEFAULT_MODE); mSPoolDataTabFd=shm_open(space->poolDataTabId,O_RDWR,MSGSPACE_DEFAULT_MODE);
if (mSPoolDataTabFd == -1 ) { if (mSPoolDataTabFd == -1 ) {
fprintf( stderr, "Allocate %s failed: %s\n", fprintf( stderr, "Allocate %s failed: %s\n",
(char*)space->poolDataId, (char*)space->poolDataTabId,
strerror( errno ) ); strerror( errno ) );
return NULL; return NULL;
} }
@ -142,13 +142,13 @@ void * msgAllocate(msgSpace *space,
/* on a acqui un semaphore pour la ressouce */ /* on a acqui un semaphore pour la ressouce */
/* on acquiert le droit de modifier les infos sur la ressource */ /* on acquiert le droit de modifier les infos sur la ressource */
poolDataSemFd=sem_open(space->poolDataSemId,O_CREAT,SEM_DEFAULT_MODE,1); poolDataTabSemFd=sem_open(space->poolDataTabSemId,O_CREAT,SEM_DEFAULT_MODE,1);
/* on modifie maintenant les données */ /* on modifie maintenant les données */
/* TODO: mapper le buffer libre dans l'esp addr du proc */ /* TODO: mapper le buffer libre dans l'esp addr du proc */
sem_close(poolDataSemFd); sem_close(poolDataTabSemFd);
/* TODO: unmapper le msgPoolDataTab */ /* TODO: unmapper le msgPoolDataTab */

8
test/Makefile
View file

@ -11,8 +11,8 @@ CC=gcc
CFLAGS=-Wall --static -O2 -ggdb CFLAGS=-Wall --static -O2 -ggdb
#-O2 -ggdb #-O2 -ggdb
INCLUDES=-I ../src/ INCLUDES=-I /usr/include -I ../src/
LIBINC=-L ../src -L /usr/lib LIBINC=-L /usr/lib -L ../src
LIBS=-lnazgul LIBS=-lnazgul
ifeq "SunOS" "${OS}" ifeq "SunOS" "${OS}"
@ -20,7 +20,7 @@ ifeq "SunOS" "${OS}"
endif endif
ifeq "Linux" "${OS}" ifeq "Linux" "${OS}"
LIBS=-lnazgul -lrt LIBS=-lnazgul -lrt -lpthread
endif endif
PRJNAME=Libnazgul PRJNAME=Libnazgul
@ -42,5 +42,5 @@ clean:
@rm -f $(FILES) @rm -f $(FILES)
% : %.c % : %.c
$(CC) $(CFLAGS) $< -o $* $(INCLUDES) $(LIBINC) $(LIBS) $(CC) -o $* $< $(INCLUDES) $(LIBINC) $(LIBS) $(CFLAGS)