From cf8073ca65dc6a220b23f0d9ebcc4991c5118d0d Mon Sep 17 00:00:00 2001
From: glenux <glenux>
Date: Thu, 26 Feb 2004 10:21:55 +0000
Subject: [PATCH] * spaceState
---
src/proto.h | 6 ++++--
src/spaceCreate.c | 4 +---
src/spaceListFindId.c | 5 ++++-
test/put_get_multi.c | 2 ++
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/proto.h b/src/proto.h
index 7f302f9..e78ac12 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -82,6 +82,8 @@ int msgQueueReadTryLock(msgSpaceId externId, int queueIdx);
int msgQueueReadUnlock(msgSpaceId externId, int queueIdx);
/* queueRem.c */
int msgQueueRem(msgQueue *queue, msgQueueElemId oldElemId);
+/* spaceClose.c */
+int msgSpaceClose(msgSpace *space);
/* spaceCreate.c */
msgSpace *msgSpaceCreate(msgSpaceId externId, int queueNb, int poolNb, msgPool *poolInfos);
/* spaceDelete.c */
@@ -98,7 +100,7 @@ int msgSpaceListElemCreate(msgSpaceListElemId listElemId, msgSpace *space);
/* spaceListElemOpen.c */
void *msgSpaceListElemOpen(msgSpaceListElemId listElemId);
/* spaceListFindId.c */
-int msgSpaceListFindId(msgSpaceId spaceId);
+int msgSpaceListFindId(msgSpaceId externId);
int msgSpaceListElemFindId(msgSpaceListElemId elemId, msgSpaceId spaceId);
/* spaceListInit.c */
int msgSpaceListInit(void);
@@ -111,6 +113,6 @@ void *msgSpaceListOpen(void);
int msgSpaceListRem(msgSpaceId spaceId);
/* spaceOpen.c */
msgSpace *msgSpaceOpen(msgSpaceId externId);
-/* state.c */
+/* spaceState.c */
#endif
diff --git a/src/spaceCreate.c b/src/spaceCreate.c
index 4b18079..2c2349c 100644
--- a/src/spaceCreate.c
+++ b/src/spaceCreate.c
@@ -46,14 +46,12 @@ msgSpace * msgSpaceCreate(
NZG_ERROR("msgSpaceListInit",nzgId);
goto ERROR;
};
- printf("spaceListInit ok\n");
if (msgSpaceListLock() <0){
NZG_ERROR("msgSpaceListLock","");
goto ERROR;
}
- printf("spaceListLock ok\n");
int err;
- if ((err=msgSpaceListFindId(nzgId)) < 1){
+ if ((err=msgSpaceListFindId(externId)) < 1){
if (err==0){
// soit le msgSpace existe deja
NZG_ERROR("spaceListFindId : existing ",nzgId);
diff --git a/src/spaceListFindId.c b/src/spaceListFindId.c
index f5c8c1c..1d9435c 100644
--- a/src/spaceListFindId.c
+++ b/src/spaceListFindId.c
@@ -2,8 +2,11 @@
#define DEBUG 1
-int msgSpaceListFindId(msgSpaceId spaceId){
+int msgSpaceListFindId(msgSpaceId externId){
msgSpaceList * list;
+ msgSpaceId spaceId;
+
+ msgSpaceIdIntern(spaceId,externId);
msgSpaceListElemId listHeadElemId;
msgSpaceListElemId listTailElemId;
msgSpaceListId listId;
diff --git a/test/put_get_multi.c b/test/put_get_multi.c
index 7dcac05..f23a5eb 100644
--- a/test/put_get_multi.c
+++ b/test/put_get_multi.c
@@ -43,6 +43,8 @@ if (pid==0){
printf("get-ok\n");
printf("### test Reception %d ###\n",(int)*montext);
msgFree(mSPAC,montext);
+ wait(NULL);
+ msgSpaceDelete(testId);
}
return 0;
}