Changeset 3366 in Sophya for trunk/SophyaPI/PIext/piacmd.cc

Timestamp:

Oct 30, 2007, 1:57:40 PM (18 years ago)

Author:

ansari

Message:

Tentative pour regler le probleme de blocage de piapp suite a affichage de la fefenetre de gestion d'objets.

1/ Protection dans NamedObjMgr() pour eviter deadlock de mutex (ds NamedObjMgr::UpdateObjMgrWindow() en particulier)
2/ Introduction de la classe SOpExObj (fichier piacmd.h .cc) pour execution d'operations sur objets, initiees depuis la boucle d'evts, dans un thread separe.

Reza , 30/10/2007

File:

• trunk/SophyaPI/PIext/piacmd.cc (modified) (1 diff)

trunk/SophyaPI/PIext/piacmd.cc

@@ -401 +401 @@
 Commander::ShowMessage(msg, att);
 }
+
+
+/* --Methode-- */
+SOpExObj::SOpExObj(PIStdImgApp* app)
+{
+  mImgApp = app;
+  fg_thrstop = false;
+  fg_threxe = false;
+}
+
+/* --Methode-- */
+SOpExObj::~SOpExObj()
+{
+}
+
+/* --Methode-- */
+void SOpExObj::AddOpe(string const & line)
+{
+  mutx_inps.lock();
+  inputlines.push(line);   // Ajout d'un element en fin de queue
+  mutx_inps.unlock();
+  mutx_inps.broadcast();
+}
+
+/* --Methode-- */
+void SOpExObj::run()
+{
+  NamedObjMgr omg;
+  while (!fg_thrstop) {
+    mutx_inps.lock();
+    while (inputlines.empty()) { 
+      fg_threxe = false;
+      mutx_inps.wait();
+    }
+    string cmd = inputlines.front().substr(0,3);   // On recupere l'element de tete
+    string nom = inputlines.front().substr(4);   // On recupere l'element de tete
+    inputlines.pop();    // On supprime l'element de tete
+    fg_threxe = true;
+    mutx_inps.unlock();
+    try {
+      if (cmd == "SCO") {  // set cobj 
+        string ss = "set cobj ";
+        ss += nom;
+        cout << " Defining cobj : " << ss << endl;
+        mImgApp->CmdInterpreter()->AddInputLine(ss);
+      }
+      else if (cmd == "DIS") {  // display obj
+        omg.DisplayObj(nom);
+      }
+      else if (cmd == "PRT") {  // print obj
+        omg.PrintObj(nom);
+      }
+      else if (cmd == "DEL") {  // delete obj
+        omg.DelObj(nom);
+      }
+      else if (cmd == "SAV") {  // saveppf obj
+        if (mImgApp->mPpfout)  omg.SaveObj(nom, *(mImgApp->mPpfout), false);
+      }
+      else cerr << "SOpExObj::run() ERROR CMD= " << cmd << endl; 
+    }
+    catch (PThrowable& pex) {  // Catching SOPHYA exceptions 
+      cerr << "SOpExObj::run() SOPHYA exception CMD=" << cmd << " NOM=" << nom << "\n"
+           << (string)typeid(pex).name() << " Msg= " << pex.Msg() << endl;
+    }
+    catch (std::exception& sex) {
+      cerr << "SOpExObj::run() std::exception CMD=" << cmd << " NOM=" << nom << "\n"
+           << (string)typeid(sex).name() << " Msg= " << sex.what() << endl;
+    }
+    catch (...) {
+      cerr << "SOpExObj::run() unknown exception (...) CMD=" 
+           << cmd << " NOM=" << nom << endl;
+    }
+  }
+}