Changeset 2492 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Jan 6, 2004, 6:05:25 PM (22 years ago)

Author:

ansari

Message:

Suite debug piapp multithread : on ne peut pas utiliser ZSync() ds un if (destructeur appele de suite) - Reza 06/01/2004

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (10 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -321 +321 @@
 if (myImgApp)  { 
   string str = '/' + dirname;
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   (myImgApp->ObjMgrW())->AddDirectory(str.c_str(), myDirId);
-  }
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
+}
 if (verbeux) cout << "NamedObjMgr::CreateDir() " << dirname << " Created " << endl;
 return(true);
@@ -355 +356 @@
 
 if (myImgApp) {
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
 myDirs->erase(it);
@@ -497 +499 @@
 for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj(*ii,true);
 if (myImgApp) {
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   (myImgApp->ObjMgrW())->UpdateList(did);
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
 }
@@ -607 +610 @@
 
 if (myImgApp != NULL) {
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
     string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
     (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
   }
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
 if (verbeux) cout << "NamedObjMgr::AddObj()  Object " << nom << " ( "  
@@ -689 +693 @@
 
 if (myImgApp != NULL) {
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
     (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
@@ -695 +699 @@
     (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
   }
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
 if (verbeux) 
@@ -741 +746 @@
 if (myImgApp) {
 //DBG  cerr << " *DBG* NamedObjMgr::DelObj Sz= " << (*it).second.wrsid.size() << endl; 
+// Si appel venant de PIStdImgApp, il ne faut pas locker le Mutex global de la boucle d'evts
+  bool fglock = (_fgimgapp) ? false : true;
+  if (fglock) myImgApp->LockMutex();
   for(ii=(*it).second.wrsid.begin(); ii != (*it).second.wrsid.end(); ii++) 
       myImgApp->DelWRsId((*ii));
+  if (fglock) myImgApp->UnlockMutex(true);
 }
 delete (*it).second.obja;  // destruction de l'adaptateur 
@@ -748 +757 @@
 
 if (myImgApp != NULL) {
-  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
     int olid = (*it).second.oid;
     (myImgApp->ObjMgrW())->DelObjList(did, olid);
   }
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
 myObjs->erase(it);
@@ -1593 +1603 @@
 if (!myImgApp)  return;
 ZSync(*myMutex);
-if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+if ( !_fgimgapp )  myImgApp->LockMutex();
 
 (myImgApp->ObjMgrW())->ClearObjList();
@@ -1606 +1616 @@
   (myImgApp->ObjMgrW())->AddObj(cn.c_str(), (*it).second.oid);
   }
+
+if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }