Changeset 2486 in Sophya for trunk/SophyaPI/PIext/pistdimgapp.cc

Timestamp:

Dec 26, 2003, 12:17:41 PM (22 years ago)

Author:

ansari

Message:

Debut d'implementation piapp multi-thread - (avec des pb lors de l'execution de demo.pic) Reza 26 Dec 2003

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -90 +90 @@
 /* --Methode-- */
 PIStdImgApp::PIStdImgApp(int narg, char* arg[])
-: PIApplication(420, 320, narg, arg)
+  : PIApplication(420, 320, narg, arg) , resusg(ResourceUsage::RU_All)
 {
 
@@ -188 +188 @@
 // le widget zoom, colormap, stats, ...
 
-int bss = 100+mFgScSz*15;
+int bss = 105+mFgScSz*15;
 
 int statc_szy = bss+10+14+mFgScSz*2+5; 
@@ -202 +202 @@
 
 // Widget pour affichage des stats / ressources 
-lab_mem = new PILabel(statcont, "memlab", msx-2*(bss+20), 20, 2*bss+20, 10);
+lab_mem = new PILabel(statcont, "memlab", msx-2*(bss+20), 20, 2*bss+20, 5);
 lab_mem->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_free); 
 lab_mem->SetLabel("MemoryUsage");
 lab_mem->SetForegroundColor(PI_Red);
 lab_mem->SetBorderWidth(1);
-therm_mem = new PIThermometer(statcont, "memtherm", msx-2*(bss+20), 20, 2*bss+20, 35);
+therm_mem = new PIThermometer(statcont, "memtherm", msx-2*(bss+20), 15, 2*bss+20, 30);
 therm_mem->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_free); 
 therm_mem->SetThreshold(0.5, 0.75);
 
-lab_cpu = new PILabel(statcont, "cpulab", msx-2*(bss+20), 20, 2*bss+20, 60);
+lab_cpu = new PILabel(statcont, "cpulab", msx-2*(bss+20), 20, 2*bss+20, 50);
 lab_cpu->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_free); 
 lab_cpu->SetLabel("CPUUsage");
 lab_cpu->SetForegroundColor(PI_Black);
 lab_cpu->SetBorderWidth(1);
-therm_cpu = new PIThermometer(statcont, "cputherm", msx-2*(bss+20), 20, 2*bss+20, 85);
+therm_cpu = new PIThermometer(statcont, "cputherm", msx-2*(bss+20), 15, 2*bss+20, 75);
 therm_cpu->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_free); 
 therm_cpu->SetThreshold(0.75, 0.90);
-
- fg_exc_cmd = false;
+lab_thrcmd = new PILabel(statcont, "thrcmdlab", msx-2*(bss+20), 20, 2*bss+20, 95);
+lab_thrcmd->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_free); 
+lab_thrcmd->SetLabel("CommandThread");
+lab_thrcmd->SetForegroundColor(PI_Green);
+lab_thrcmd->SetBorderWidth(1);
+
+fg_exc_cmd = false;
+mCmd = NULL;  // Avant d'appeler UpdateStatResource() si PIACmd non cree
 UpdateStatResourceInfo();
 resupd_periodic = new SIA_RU__Periodic(this);
@@ -347 +353 @@
 delete lab_cpu;
 delete therm_cpu;
+delete lab_thrcmd;
 
 delete statcont;
@@ -372 +379 @@
 
 }  
+
+/* --Methode-- */
+void PIStdImgApp::Run()
+{
+XEvent evt;
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
+// Pour appeler FinishCreate() des objets dans la fenetre principale 
+if (mStop) { // C'est la premiere fois
+  topcont->SetSize(topcont->XSize(), topcont->YSize());
+  MBCont()->FinishCreate();   
+  }
+else mStop = true;   // On rerentre apres un stop 
+
+mCmd->start();
+
+while (mStop) {
+  thr_glsyn.lock(); //  <ZThread> 
+  if (XtAppPending(*appctx) != 0) {
+    XtAppNextEvent(*appctx, &evt);
+    XtDispatchEvent(&evt);
+  }
+  thr_glsyn.unlock(); // <ZThread>
+  usleep(1000);
+}
+return;
+}
 
 /* --Methode-- */
@@ -479 +513 @@
 #else
   try {
-    mCmd->Interpret(s);
+    //    mCmd->Interpret(s);
+    mCmd->AddInputLine(s);
     }  
   catch ( PThrowable & exc ) {
@@ -559 +594 @@
 // Pas de same ou inset pour DispImage
 if ((dwopt == Disp_Same) || (dwopt == Disp_Inset) ) dwopt = Disp_Next;
+
+// <ZThread> global PIApplication event loop synchronisation
+ZSync zs(thr_glsyn);  
 
 // Choix de la taille de fenetre
@@ -626 +664 @@
 DispWinEnum dwopt = ParseDisplayOption(sop, opts);
 if ( (!mLastWdg) && ( (dwopt == Disp_Same) || (dwopt == Disp_Inset) ) )  dwopt = Disp_Next;
+
+// <ZThread> global PIApplication event loop synchronisation
+ZSync zs(thr_glsyn);  
+
 // Trace en superpoistion
 if ( (dwopt == Disp_Same) && (mLastWdg) ) {  
@@ -726 +768 @@
 
 if ( (!mLastWdg) && ( (dwopt == Disp_Same) || (dwopt == Disp_Inset) ) )  dwopt = Disp_Next;
+
+// <ZThread> global PIApplication event loop synchronisation
+ZSync zs(thr_glsyn);  
+
 // Trace en superpoistion
 if ( (dwopt == Disp_Same) && (mLastWdg) ) {
@@ -1359 +1405 @@
   else 
     therm_cpu->SetValue(resusg.getAverageCPULoad());
+  int nlx = 0;
+  bool fgx = false;
+  if (mCmd) fgx = mCmd->isRunning(nlx);
+  if (!fgx) {
+    lab = "PIACmdThread Idle";
+    lab_thrcmd->SetLabel(lab);
+    lab_thrcmd->SetForegroundColor(PI_Green);
+  }
+  else {
+    sprintf(buff, "PIACmdThread Running - NL=%d" , nlx);
+    lab = buff;
+    lab_thrcmd->SetLabel(lab);
+    if (nlx < 3)     lab_thrcmd->SetForegroundColor(PI_Yellow);
+    else     lab_thrcmd->SetForegroundColor(PI_Red);   
+  }
 }