*** empty log message ***

src/allocate.c

@@ -183,9 +183,6 @@ if (mSPoolDataTabAddr==NULL){
   /* mapper le buffer libre dans l'esp addr du proc */
   strcpy(resultPoolId,mSPoolDataTabAddr[selectedPoolIndex].poolId);
 
-
-/*  mSPoolFd=shm_open(resultPoolId,O_RDWR,MSGSPACE_DEFAULT_MODE); */
-
   int bufferFreeSize;
   bufferFreeSize=mSPoolDataTabAddr[selectedPoolIndex].bufferSize;
  printf("BufferSize : %d\n", bufferFreeSize);

src/get.c

@@ -34,7 +34,10 @@ void * msgGet(msgSpace * space,int queueIndex,int option){
   msgQueueRem(queue, oldElemId);
 
   oldElem = msgQueueElemOpen(oldElemId);
-
+  if (oldElem == NULL){
+	NZG_ERROR("msgQueueElemOpen",oldElemId);
+	goto ERROR;
+  }
   /* on récupere la taille des buffer dans la pool du buffer */
   msgPoolData * poolDataTab;
   poolDataTab=msgPoolDataTabOpen(space);
@@ -50,9 +53,12 @@ void * msgGet(msgSpace * space,int queueIndex,int option){
   }
 
   msgPoolDataTabClose(space,poolDataTab);
+  if (msgQueueElemClose(oldElem) <0){
+	NZG_ERROR("msgQueueElemClose",oldElemId);
+  }
 
+  shm_unlink(oldElemId);
 
-  
   // fermer la file
   msgQueueClose(queue);
 

src/proto.h

@@ -57,7 +57,7 @@ int msgQueueAdd(msgQueue *queue, msgQueueElemId newElemId);
 /* queueClose.c */
 int msgQueueClose(msgQueue *queue);
 /* queueDelete.c */
-int msgQueueElemDelete(msgQueueElemId queueElemId);
+int msgQueueDelete(msgQueueId externId, int queueIdx);
 /* queueElemClose.c */
 int msgQueueElemClose(msgQueueElem *queueElem);
 /* queueElemCreate.c */
@@ -108,7 +108,7 @@ int msgSpaceListUnlock(void);
 /* spaceListOpen.c */
 void *msgSpaceListOpen(void);
 /* spaceListRem.c */
-int msgSpaceListRem(msgSpaceListElemId oldElemId);
+int msgSpaceListRem(msgSpaceId spaceId);
 /* spaceOpen.c */
 msgSpace *msgSpaceOpen(msgSpaceId externId);
 /* state.c */

src/queueDelete.c

@@ -1,26 +1,33 @@
 #include "libnazgul.h"
 
-int msgQueueElemDelete(msgQueueElemId queueElemId){
+int msgQueueDelete(msgQueueId externId,int queueIdx){
-  msgQueueElem * queueElemAddr;
+  msgQueue * queue;
-  msgQueueElemId nextIdToDie;
+  msgQueueId queueId;  
   
-	
+  msgQueueIdIntern(queueId,externId,queueIdx);
-  queueElemAddr = msgQueueElemOpen(queueElemId);
+  queue = msgQueueOpen(queueId);
-  strcpy(nextIdToDie,queueElemAddr->id);
+
-  msgQueueElemClose(queueElemAddr);
+  if (strcmp(queue->headId,queue->id)!=0){
-  
+	// liste non-vide
-  if (shm_unlink(queueElemId) < 0){
+	if (msgQueueElemDelete(queue->headId) <0){
-  	NZG_ERROR("shm_unlink msgQueueElem",queueElemId);
+	  NZG_ERROR("msgQueueElemDelete",queue->headId);
- 	goto ERROR;	
+	  goto ERROR;
+	}
+  }
+ 
+  msgQueueSemId queueProtLockSemId;
+  msgQueueSemId queueReadLockSemId;
+  msgQueueProtSemIdIntern(queueProtLockSemId,externId,queueIdx);
+  msgQueueReadSemIdIntern(queueReadLockSemId,externId,queueIdx);
+  sem_unlink(queueProtLockSemId);
+  sem_unlink(queueReadLockSemId);
+
+  if (shm_unlink(queueId) < 0){
+	NZG_ERROR("shm_unlink msgQueueElem",queueId);
+	goto ERROR;	
   }
 
-  if (strcmp(nextIdToDie,queueElemId)==0){
+  return 0;
-	return 0;
-  } else {
-	return msgQueueElemDelete(nextIdToDie);
-  }
-
-
 ERROR:
   return -1;
 }

src/queueElemDelete.c

@@ -1,25 +1,30 @@
 #include "libnazgul.h"
 
 int msgQueueElemDelete(msgQueueElemId queueElemId){
-  msgQueueElem * queueElemAddr;
+  msgQueueElem * queueElem;
   msgQueueElemId nextIdToDie;
   
-  queueElemAddr = msgQueueElemOpen(queueElemId);
+  queueElem = msgQueueElemOpen(queueElemId);
-  if (queueElemAddr==NULL){
+  if (queueElem==NULL){
 	NZG_ERROR("msgQueueElemOpen",queueElemId);
 	goto ERROR;
   }
 
-	strcpy(nextIdToDie, queueElemAddr->next);
+  strcpy(nextIdToDie, queueElem->next);
 	
-  if (msgQueueElemClose(queueElemAddr) < 0){
+  if (msgQueueElemClose(queueElem) < 0){
   	NZG_ERROR("msgQueueElemClose",queueElemId);
 	goto ERROR;
   }
 
+  // on détruit l'élément
+  shm_unlink(queueElemId);
+
   if (nextIdToDie != queueElemId){
 	return msgQueueElemDelete(nextIdToDie);
   } else {
+	printf("msgQueueElemDelete: EOL reached \n");
+	// element unique...
 	return 0;
   }
 

src/queueRem.c

@@ -20,6 +20,9 @@ int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId){
 
   // on indique à la queue le nouveau premier element
   strcpy(queue->headId,queueOldHeadElem->next);
+  if (strcmp(queueOldHeadElem->next,oldElemId)==0){
+  strcpy(queue->headId,queue->id);
+  }
   // on fait en sorte que l'element ne connaisse plus
   // ses voisins (utile pour le Delete)
   strcpy(queueOldHeadElem->next,queueOldHeadElem->id);
@@ -29,8 +32,7 @@ int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId){
 	goto ERROR;
 
   }
-	
+  return 0;
-	return 0;
 ERROR:
   return -1;
 }

src/spaceDelete.c

@@ -14,23 +14,28 @@ int msgSpaceDelete(msgSpaceId externId){
   msgSpace * space;
   int i;
   if (msgSpaceIdIntern(nzgId,externId) == -1){
-	//TODO: message d'erreur
+	NZG_ERROR("msgSpaceIdIntern",externId);
-	return -1;
+	goto ERROR;
   }
 
   space = msgSpaceOpen(externId);
-  /* TODO: supprimer chaque pool */
+  /* supprimer chaque pool */
- for (i=0;i<space->poolNb;i++){
+  for (i=0;i<space->poolNb;i++){
-   msgPoolDelete(externId,i);
+	msgPoolDelete(externId,i);
- }
+  }
+
+  /* supprimer chaque queue */
+  for (i=0;i<space->queueNb;i++){
+	msgQueueDelete(externId,i);
+  }
   printf("openned successfully !\n");
   printf("Unlinking DataTab... ");
   if (shm_unlink(space->poolDataTabId) < 0){
-  	perror("shm_unlink");
+	perror("shm_unlink");
 	return -1;
   }
   printf("ok\n");
-  
+
   printf("Unlinking DataTabSem... ");
   if (sem_unlink(space->poolDataTabSemId) < 0){
 	NZG_ERROR("sem_unlink",space->poolDataTabSemId);
@@ -46,7 +51,7 @@ int msgSpaceDelete(msgSpaceId externId){
 	NZG_ERROR("msgSpaceListLock","");
 	goto ERROR;
   }
-  
+
   if (msgSpaceListRem(nzgId) < 0){
 	NZG_ERROR("msgSpaceListRem",nzgId);
 	goto ERROR;

test/put_get_mono.c

@@ -28,6 +28,8 @@ int main(void) {
   printf("CREATION ------------------ ok\n");
 
   mSPAC=msgSpaceOpen(testId);
+
+  /***** TEST 1 *****/
   montext=msgAllocate(mSPAC,1,280,0); 
   *montext=42;
   printf("### test Valeur0 %d ###\n",(int)*montext);
@@ -40,6 +42,8 @@ int main(void) {
   montext=msgGet(mSPAC,0,0);
   printf("get-ok\n");
   printf("### test Reception %d ###\n",(int)*montext);
+  msgFree(mSPAC,montext);
+  /***** TEST 1 *****/
   msgSpaceDelete(testId);
   return 0;
 }