Changeset 2490 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jan 2, 2004, 12:31:36 AM (22 years ago)

Author:

ansari

Message:

Suite modifs pour piapp multi-thread - introduction de lock lors de la mise a jour de la fenetre ObjMgr par NamedObjMgr - Reza 1 Jan 2004

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (8 diffs)
• nobjmgr.h (modified) (2 diffs)
• piacmd.cc (modified) (3 diffs)
• piacmd.h (modified) (1 diff)
• pistdimgapp.cc (modified) (3 diffs)
• pistdimgapp.h (modified) (2 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -108 +108 @@
 
 /* --Methode-- */
-NamedObjMgr::NamedObjMgr()
-{
+NamedObjMgr::NamedObjMgr(bool fgimgapp)
+{
+_fgimgapp = fgimgapp;
 if (fgOInit == 0) { 
   myNObj = 0;
@@ -302 +303 @@
 if (myImgApp)  { 
   string str = '/' + dirname;
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->AddDirectory(str.c_str(), myDirId);
   }
@@ -333 +335 @@
   }
 
-if (myImgApp)  
+if (myImgApp) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
+}
 myDirs->erase(it);
 if (verbeux) cout << "NamedObjMgr::DeleteDir() " << dirname << " deleted " << endl;  
@@ -459 +463 @@
 list<string>::iterator ii;
 for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj(*ii,true);
-if (myImgApp)  
+if (myImgApp) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->UpdateList(did);
+}
 }
 
@@ -561 +567 @@
 (*itr).second.nobj++;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
-  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
-  }
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
+    (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+  }
+}
 if (verbeux) cout << "NamedObjMgr::AddObj()  Object " << nom << " ( "  
      << typeid(*obj).name() << " ) added (Total= " << myObjs->size() << ")" << endl;  
@@ -632 +641 @@
 (*itr).second.nobj++;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
-  string oln = n2 + "  (T= " + no.obja->GetDataObjType() + ")" ; 
-  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
+    string oln = n2 + "  (T= " + no.obja->GetDataObjType() + ")" ; 
+    (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+  }
 }
 if (verbeux) 
@@ -681 +693 @@
 if (fgd) delete (*it).second.obj;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  int olid = (*it).second.oid;
-  (myImgApp->ObjMgrW())->DelObjList(did, olid);
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    int olid = (*it).second.oid;
+    (myImgApp->ObjMgrW())->DelObjList(did, olid);
+  }
 }
 myObjs->erase(it);
@@ -1474 +1489 @@
 {
 if (!myImgApp)  return;
+if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+
 (myImgApp->ObjMgrW())->ClearObjList();
 

trunk/SophyaPI/PIext/nobjmgr.h

@@ -26 +26 @@
 public:
 // Constructeur et destructeur
-                        NamedObjMgr();
+                        NamedObjMgr(bool fgimgapp=false);
   virtual               ~NamedObjMgr();
 
@@ -107 +107 @@
   static bool CheckDirName(string & nom);
   static int  ParseObjectName(string & nom, string & nomrep, string & nomobj);
+
+protected:
+  bool _fgimgapp;  // true -> cree par PIStdImgApp / pour gestion de thread
 };
 

trunk/SophyaPI/PIext/piacmd.cc

@@ -146 +146 @@
 // static PIACmd* curpiacmd = NULL;
 /* --Methode-- */
-PIACmd::PIACmd(NamedObjMgr* omg, PIStdImgApp* app)
+PIACmd::PIACmd(PIStdImgApp* app)
   : Commander()
 {
-mObjMgr = omg; 
+mObjMgr = new NamedObjMgr; 
 mImgApp = app;
 helpwin = new PIAHelpWind(app, this);
@@ -165 +165 @@
 RegisterCommand(kw, usage, NULL, grp);
 
-basexec = new PIABaseExecutor(this, omg, app);
+basexec = new PIABaseExecutor(this, mObjMgr, app);
 fitexec = new PIAFitter(this, app);
 pawexec = new PAWExecutor(this, app);
@@ -188 +188 @@
 PIACmd::~PIACmd()
 {
- 
+delete mObjMgr;
 delete helpwin;
 delete cxxexwin;

trunk/SophyaPI/PIext/piacmd.h

@@ -35 +35 @@
   //  static PIACmd*    GetInterpreter();
 
-                        PIACmd(NamedObjMgr* omg, PIStdImgApp* app);
+                        PIACmd(PIStdImgApp* app);
   virtual               ~PIACmd();
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -251 +251 @@
 // RedirectStdOutErr(true);  pas par defaut 
  
-mObjMgr = new NamedObjMgr;
-mCmd = new PIACmd(mObjMgr, this);
+mObjMgr = new NamedObjMgr(true);
+mCmd = new PIACmd(this);
 
 // Pas trop de message de la part de NamedObjMgr
@@ -322 +322 @@
 
 SetReady();
+fg_glsynlock = false;
 }
 
@@ -418 +419 @@
 }
 
-bool fg_gls_lock = false;
+
 while (mStop) {
   thr_glsyn.lock(); //  <ZThread> 
+  fg_glsynlock = true;
   while (XtAppPending(*appctx) != 0) {
     XtAppNextEvent(*appctx, &evt);
     XtDispatchEvent(&evt);
   }
+  fg_glsynlock = false;
   thr_glsyn.unlock(); //  <ZThread> 
   //  thr_glsyn.wait();

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -58 +58 @@
      virtual void   Run();
      inline ZMutex &   getMutex() { return thr_glsyn; }
+     inline bool       isGlSyncLocked() { return fg_glsynlock; }
 
   // Methodes d'Affichage generique
@@ -234 +235 @@
   // Attributs pour controle de thread
     ZMutex thr_glsyn;
+    bool fg_glsynlock;  // true: thr_glsyn locke pour traitement evts
 };