From 4d535fd155bf234cc67f88b8524ce18134cbad00 Mon Sep 17 00:00:00 2001
From: glenux <glenux>
Date: Wed, 25 Feb 2004 08:13:09 +0000
Subject: [PATCH] *** empty log message ***

---
 src/allocate.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/allocate.c b/src/allocate.c
index b848053..afc3192 100644
--- a/src/allocate.c
+++ b/src/allocate.c
@@ -181,29 +181,19 @@ void * msgAllocate(msgSpace *space,
   strcpy(resultPoolId,mSPoolDataTabAddr[selectedPoolIndex].poolId);
 
 
-  mSPoolFd=shm_open(resultPoolId,O_RDWR,MSGSPACE_DEFAULT_MODE);
+/*  mSPoolFd=shm_open(resultPoolId,O_RDWR,MSGSPACE_DEFAULT_MODE); */
 
   int bufferFreeSize;
   bufferFreeSize=mSPoolDataTabAddr[selectedPoolIndex].bufferSize;
  printf("BufferSize : %d", bufferFreeSize);
- 
- bufferNb=mSPoolDataTabAddr[selectedPoolIndex].bufferNb; 
- // on mappe la totalité du pool
- resultAddr = mmap( NULL, 
-	  bufferFreeSize*bufferNb, /* bufferFreeSize*/
-	  PROT_NONE, //prot PROT_READ | PROT_WRITE
-	  MAP_SHARED, mSPoolFd,
-	  (off_t)0); 
- 
-// mprotect(resultAddr,bufferFreeSize*bufferNb,PROT_NONE);
- mprotect(resultAddr,bufferFreeSize*(bufferFreeIndex+1),PROT_READ|PROT_WRITE);
- //mprotect(resultAddr,bufferFreeSize*bufferFreeIndex,PROT_NONE);
- resultAddr=resultAddr +( bufferFreeSize*bufferFreeIndex);
+<<<<<<< allocate.c
+  
+ resultAddr=msgBufferMap(mSPoolDataTabAddr,selectedPoolIndex,bufferFreeIndex);
+ if (resultAddr==NULL){
+   NZG_ERROR("msgBufferMap",mSPoolDataTabAddr[selectedPoolIndex].poolId);
+   goto ERROR;
+ }
 
-  if( resultAddr == MAP_FAILED) {
-	NZG_ERROR("resultAddr mmap","");
-	goto ERROR;
-  }
 
   //TODO:
   /* - on s'enregistre aupres de ce buffer */  
@@ -211,7 +201,7 @@ void * msgAllocate(msgSpace *space,
 	  selectedPoolIndex,
 	  bufferFreeIndex,
 	  resultAddr);  
-  close(mSPoolFd);
+/*  close(mSPoolFd); */
 
   msgPoolDataTabUnlock(space);