Changeset 2492 in Sophya for trunk/SophyaPI/PIext

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

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (10 diffs)
• pistdimgapp.cc (modified) (8 diffs)
• pistdimgapp.h (modified) (1 diff)

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);
 }
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -2 +2 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
 
@@ -406 +407 @@
   {
     while (!_fgstop) {
-      usleep(1000);
+      usleep(2000);
       _app->getMutex().broadcast();
     }
@@ -443 +444 @@
 
 thr_glsyn.lock(); //  <ZThread> 
-//DBG int klp = 0;
+//DEL-DBG int klp = 0;
 while (mStop) {
   fg_glsynlock = true;
@@ -451 +452 @@
     XtDispatchEvent(&evt);
     nevtproc++;
-    if (nevtproc >= 50)  break;
+    if (nevtproc >= 200)  break;
   }
   fg_glsynlock = false;
+  //DBG cout << " "DBG-Run:: Going to wait ... " << klp << endl;
   thr_glsyn.wait();  //  <ZThread> 
-  //  cout << "DBG-Run:: Out of wait " << ++klp << endl;  
+  //DBG cout << "DBG-Run:: Out of wait " << ++klp << endl;  
     //  usleep(1000);
 }
@@ -626 +628 @@
 }
 
+class SyncPIS {
+public:
+  explicit SyncPIS(ZMutex & mtx, bool fglock=true, int sigbr=0) 
+  {
+  _mtx = &mtx; _sigbr = sigbr; 
+  _fglock = fglock; 
+  if (_fglock)  mtx.lock(); 
+  }
+  ~SyncPIS() 
+  { 
+    if (_fglock && (_mtx != NULL) ) { 
+      if (_sigbr == 1) _mtx->signal(); 
+      else  if (_sigbr == 2) _mtx->broadcast(); 
+      _mtx->unlock(); 
+    }
+  }
+
+private:
+  ZMutex * _mtx;
+  int _sigbr;
+  bool _fglock;
+  inline        SyncPIS() {_mtx = NULL; _sigbr = 0; _fglock = false; }
+};
+
 
 /* --Methode-- */
@@ -656 +682 @@
 
 // <ZThread> global PIApplication event loop synchronisation
-if (fglock) ZSync zs(thr_glsyn, 2);  
+SyncPIS zs(getMutex(), fglock, 2);
 
 // Choix de la taille de fenetre
@@ -726 +752 @@
 
 // <ZThread> global PIApplication event loop synchronisation
-if (fglock) ZSync zs(thr_glsyn, 2);  
+SyncPIS zs(getMutex(), fglock, 2);
 
 // Trace en superpoistion
@@ -830 +856 @@
 
 // <ZThread> global PIApplication event loop synchronisation
-if (fglock) ZSync zs(thr_glsyn, 2);  
+SyncPIS zs(getMutex(), fglock, 2);
 
 // Trace en superpoistion

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -58 +58 @@
      virtual void   Run();
      inline ZMutex &   getMutex() { return thr_glsyn; }
+     inline void       LockMutex() { thr_glsyn.lock(); }
+     inline void       UnlockMutex(bool fgbr=false) 
+        { thr_glsyn.broadcast(); thr_glsyn.unlock(); }
      inline bool       isGlSyncLocked() { return fg_glsynlock; }