Changeset 3369 in Sophya

Timestamp:

Oct 31, 2007, 11:47:58 PM (18 years ago)

Author:

ansari

Message:

Ajout methodes redirect stdout/err to PIConsole a travers un fichier, Reza 31/10/2007

Location:

trunk/SophyaPI/PI

Files:

• piapplgen.cc (modified) (1 diff)
• piapplgen.h (modified) (1 diff)
• piapplx.cc (modified) (6 diffs)
• piapplx.h (modified) (1 diff)

trunk/SophyaPI/PI/piapplgen.cc

@@ -124 +124 @@
 //      vers l'objet PIConsole "cons". si "cons==NULL", redirection
 //       sur le flot original.
+//
+// void  RedirectOutStream(PIConsole* cons, string const & flnm, bool fgcpos=false, unsigned char va= PIVA_Def)
+//      Redirige le flot de sortie ("stdout" sous Unix) vers l'objet 
+//      PIConsole "cons", a travers le fichier "flnm". 
+//      Si "cons==NULL", redirection sur le flot original.
+//      Si "fgcpos==true", recopie sur le flot original, en plus de la redirection.
+//
+// void  RedirectErrStream(PIConsole* cons, string const & flnm, bool fgcpos=false, unsigned char va= PIVA_Def)
+//      Redirige le flot des messages d'erreur ("stderr" sous Unix) 
+//      vers l'objet PIConsole "cons", a travers le fichier "flnm".  
+//      Si "cons==NULL", redirection sur le flot original.
+//      Si "fgcpos==true", recopie sur le flot original, en plus de la redirection.
 //--
 

trunk/SophyaPI/PI/piapplgen.h

@@ -38 +38 @@
         virtual void              RedirectErrStream(PIConsole* cons, unsigned char va= PIVA_Red) = 0;
 
+        virtual void              RedirectOutStream(PIConsole* cons, string const & flnm, bool fgcpos=false, 
+                                                    unsigned char va= PIVA_Def)  = 0;
+        virtual void              RedirectErrStream(PIConsole* cons, string const & flnm, bool fgcpos=false, 
+                                                    unsigned char va= PIVA_Def)  = 0;
+
 protected:
     PIContainer               *topcont;

trunk/SophyaPI/PI/piapplx.cc

@@ -17 +17 @@
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <iostream>
@@ -325 +327 @@
 static XtInputId inputid[2];
 static int origfiledes[2]={-1, -1};   // descripteurs de fichiers de depart
-
+static bool fgcopieos[2]={false, false};    // Si true, recopie sur descripteurs de depart, en plus de redirection
+static int  readfiledes[2]={-1, -1};   // descripteurs de fichiers ouvert en lecture , si redirection a travers fichier
+static XtIntervalId intervid[2];
+static unsigned long tm_interv = 40;   // intervalle timer = 40 ms
+
+//DBG static FILE * dbgfip = NULL;
+
+// call-back pour gestion de redirection stdout/stderr avec pipe 
 static void redirectstream_callback(XtPointer cld, int * fd, XtInputId* /*iid*/)
 {
 char buff[512];
-int nr;
+int nr, tnr;
 
 int idx = *((int*)cld);
 if (idx != 1) idx = 0; 
 if (!consstream[idx]) return;
-while ( (nr=read(*fd, buff, 512)) > 0 ) {
+tnr = 0;
+while ( (nr=read(*fd, buff, 511)) > 0 ) {
   buff[nr] = '\0'; consstream[idx]->AddStr(buff, streamva[idx], false);
-  }
-consstream[idx]->Refresh();
+  tnr += nr;
+  }
+if (tnr > 0) consstream[idx]->Refresh();
+}
+
+// call-back pour gestion de redirection stdout/stderr avec pipe 
+static void redirectstream_timeout_callback(XtPointer cld, XtIntervalId * /*tid*/)
+{
+char buff[512];
+int nr, tnr;
+
+int idx = *((int*)cld);
+if (idx != 1) idx = 0; 
+if (!consstream[idx]) return;
+tnr = 0;
+while ( (nr=read(readfiledes[idx], buff, 511)) > 0 ) {
+  buff[nr] = '\0'; consstream[idx]->AddStr(buff, streamva[idx], false);
+  tnr += nr;
+  if (fgcopieos[idx]) write(origfiledes[idx], buff, nr);   // recopie sur filedesc original
+  }
+if (tnr > 0) consstream[idx]->Refresh();
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
+intervid[idx] = XtAppAddTimeOut(*appctx, tm_interv, redirectstream_timeout_callback, (XtPointer)(streamno+idx));
 }
 
@@ -343 +375 @@
 void PIApplicationX::RedirectOutStream(PIConsole* cons, unsigned char va)
 {
-if ( origfiledes[0]<0 )  origfiledes[0] = fcntl(1, F_DUPFD);     
-if ( cons == consstream[0]) return;
+if ( origfiledes[0]<0 )  origfiledes[0] = fcntl(1, F_DUPFD, 0);     
+if ( cons == consstream[0]) { 
+  streamva[0] = va;
+  return;
+}
 if ( (consstream[0]) && (cons) ) { consstream[0] = cons; streamva[0] = va; return; }
 else if (!cons) { 
@@ -372 +407 @@
 inputid[0] = XtAppAddInput(*appctx, p[0], (XtPointer) XtInputReadMask, 
                            redirectstream_callback, (XtPointer) streamno);
+//DBG if (dbgfip == NULL) dbgfip = fopen("debug.log","w");
 }
 
@@ -377 +413 @@
 void PIApplicationX::RedirectErrStream(PIConsole* cons, unsigned char va)
 {
-if ( origfiledes[1]<0 )  origfiledes[1] = fcntl(2, F_DUPFD);     
-if ( cons == consstream[1]) return;
+if ( origfiledes[1]<0 )  origfiledes[1] = fcntl(2, F_DUPFD, 0);     
+if ( cons == consstream[1]) { 
+  streamva[1] = va;
+  return;
+}
 if ( (consstream[1]) && (cons) ) { consstream[1] = cons; streamva[1] = va; return; }
 else if (!cons) { 
@@ -408 +447 @@
 }
 
+/* --Methode-- */
+void PIApplicationX::RedirectOutStream(PIConsole* cons, string const & flnm, bool fgcpos, unsigned char va)
+{
+if (origfiledes[0] < 0)  { 
+  origfiledes[0] = dup(1); 
+  if (origfiledes[0] < 0) { perror("RedirectOutStream()/ERROR ofd[0]<0 "); return; }
+}
+if (readfiledes[0] > -1)  { close(readfiledes[0]); readfiledes[0] = -1;}
+if (!cons) { // requete d'annulation de redirection 
+  if (origfiledes[0] > -1) dup2(origfiledes[0], 1);
+  XtRemoveTimeOut(intervid[0]);
+  consstream[0] = NULL;  
+  return;
+  }
+
+int fidso =  open(flnm.c_str(), O_CREAT|O_WRONLY|O_NONBLOCK, S_IRUSR|S_IWUSR);
+if (fidso < 0) {
+  printf("PIApplicationX::RedirectOutStream()/ERROR creating file %s \n", flnm.c_str());
+  return;
+}
+int rdfid =  open(flnm.c_str(), O_RDONLY|O_NONBLOCK, 0);
+if (rdfid < 0) {
+  printf("PIApplicationX::RedirectOutStream()/ERROR opening file %s for read \n", flnm.c_str());
+  return;
+}
+readfiledes[0] = rdfid;
+dup2(fidso, 1);   // close(1=stdout), recopie fidso en fd=1
+close(fidso);    // on ferme le fidso (on l'a recopie en fd=1)
+consstream[0] = cons; streamva[0] = va;  fgcopieos[0] = fgcpos;
+
+#if (!defined(__GNUG__) && !defined(HPUX))
+setlinebuf(stdout);
+#endif
+ios::sync_with_stdio();
+
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
+intervid[0] = XtAppAddTimeOut(*appctx, tm_interv, redirectstream_timeout_callback, 
+                              (XtPointer)(streamno+0));
+
+//DBG if (dbgfip == NULL) dbgfip = fopen("debug.log","w");
+}
+
+/* --Methode-- */
+void PIApplicationX::RedirectErrStream(PIConsole* cons, string const & flnm, bool fgcpos, unsigned char va)
+{
+if (origfiledes[1] < 0)  { 
+  origfiledes[1] = dup(2); 
+  if (origfiledes[1] < 0) { perror("RedirectOutStream()/ERROR ofd[1]<0 "); return; }
+}
+if (readfiledes[1] > -1)  { close(readfiledes[1]); readfiledes[1] = -1;}
+if (!cons) { // requete d'annulation de redirection 
+  if (origfiledes[1] > -1) dup2(origfiledes[1], 1);
+  XtRemoveTimeOut(intervid[1]);
+  consstream[1] = NULL;  
+  return;
+  }
+
+int fidso =  open(flnm.c_str(), O_CREAT|O_WRONLY|O_NONBLOCK, S_IRUSR|S_IWUSR);
+if (fidso < 0) {
+  printf("PIApplicationX::RedirectOutStream()/ERROR creating file %s \n", flnm.c_str());
+  return;
+}
+int rdfid =  open(flnm.c_str(), O_RDONLY|O_NONBLOCK, 0);
+if (rdfid < 0) {
+  printf("PIApplicationX::RedirectOutStream()/ERROR opening file %s for read \n", flnm.c_str());
+  return;
+}
+readfiledes[1] = rdfid;
+dup2(fidso, 2);   // close(2=stderr), recopie fidso en fd=2
+close(fidso);    // on ferme le fidso (on l'a recopie en fd=2)
+consstream[1] = cons; streamva[1] = va;  fgcopieos[1] = fgcpos;
+
+#if (!defined(__GNUG__) && !defined(HPUX))
+setlinebuf(stderr);
+#endif
+ios::sync_with_stdio();
+
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
+intervid[1] = XtAppAddTimeOut(*appctx, tm_interv, redirectstream_timeout_callback, 
+                              (XtPointer)(streamno+1));
+}
+

trunk/SophyaPI/PI/piapplx.h

@@ -26 +26 @@
   virtual void              RedirectOutStream(PIConsole* cons, unsigned char va= PIVA_Def);
   virtual void              RedirectErrStream(PIConsole* cons, unsigned char va= PIVA_Red);
+  virtual void              RedirectOutStream(PIConsole* cons, string const & flnm, bool fgcpos=false, 
+                                              unsigned char va= PIVA_Def);
+  virtual void              RedirectErrStream(PIConsole* cons, string const & flnm, bool fgcpos=false, 
+                                              unsigned char va= PIVA_Def);
 
   PIContainer*              MBCont() { return intcont; }