Clean up configure/build-process.
- assume C++ standard-conforming environment - add a user-option for gnuplot-support - separate gnuplot-code into declaration and implementation, so we can define at EO-build-time whether to use it or not. Adopt code and Makefiles to above changes. Some minor fixes.
This commit is contained in:
kuepper
parent
6485482f39
commit
47af7cfe5a
22 changed files with 603 additions and 537 deletions
|
|
@ -1,5 +1,3 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// eoGnuplot1DMonitor.h
|
||||
// (c) Marc Schoenauer, 2001
|
||||
|
|
@ -21,275 +19,81 @@
|
|||
Contact: Marc.Schoenauer@polytechnique.fr
|
||||
*/
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifndef NO_GNUPLOT
|
||||
|
||||
#ifndef _eoGnuplot_H
|
||||
#define _eoGnuplot_H
|
||||
#ifndef EO_eoGnuplot_H
|
||||
#define EO_eoGnuplot_H
|
||||
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
@author Marc Schoenauer 2001
|
||||
@version 0.0
|
||||
#include "pipecom.h"
|
||||
|
||||
This class is the abstract class that will be used by further gnuplot calls
|
||||
to plots what is already written by some eoMonitor into a file
|
||||
|
||||
/** Base class for calls to gnuplot
|
||||
|
||||
This class is the abstract class that will be used by further gnuplot
|
||||
calls to plots what is already written by some eoMonitor into a file
|
||||
|
||||
@author Marc Schoenauer
|
||||
@version 0.0 (2001)
|
||||
*/
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#include <fstream>
|
||||
#include <utils/pipecom.h>
|
||||
|
||||
|
||||
/** eoGnuplot: base class that will be used to call gnuplot
|
||||
*/
|
||||
class eoGnuplot
|
||||
{
|
||||
public:
|
||||
// Ctor
|
||||
eoGnuplot(std::string _title, std::string _extra = std::string("")) :
|
||||
firstTime(true)
|
||||
{
|
||||
// opens pipe with Gnuplot
|
||||
initGnuPlot(_title, _extra);
|
||||
}
|
||||
public:
|
||||
|
||||
// Dtor
|
||||
virtual ~eoGnuplot() {
|
||||
// close - the gnuplot windows if pipe was correctly opened
|
||||
if( gpCom ) {
|
||||
PipeComSend( gpCom, "quit\n" ); // Ferme gnuplot
|
||||
PipeComClose( gpCom );
|
||||
gpCom =NULL;
|
||||
}
|
||||
}
|
||||
/** Open pipe to Gnuplot.
|
||||
|
||||
/// Class name.
|
||||
virtual std::string className() const { return "eoGnuplot"; }
|
||||
@param _title Title for gnuplot window.
|
||||
@param _extra Extra parameters to gnuplot.
|
||||
*/
|
||||
eoGnuplot(std::string _title, std::string _extra = std::string(""));
|
||||
|
||||
/** send a command to gnuplot directly
|
||||
*/
|
||||
void gnuplotCommand(std::string _command)
|
||||
{
|
||||
if( gpCom ) {
|
||||
PipeComSend( gpCom, _command.c_str() );
|
||||
PipeComSend( gpCom, "\n" );
|
||||
}
|
||||
}
|
||||
/** Destructor
|
||||
|
||||
/** send a command to gnuplot directly
|
||||
*/
|
||||
void gnuplotCommand(char * _command)
|
||||
{
|
||||
if( gpCom ) {
|
||||
PipeComSend( gpCom, _command );
|
||||
PipeComSend( gpCom, "\n" );
|
||||
}
|
||||
}
|
||||
Close the gnuplot windows if pipe was correctly opened
|
||||
*/
|
||||
virtual ~eoGnuplot();
|
||||
|
||||
/** Class name */
|
||||
virtual std::string className() const
|
||||
{ return "eoGnuplot"; }
|
||||
|
||||
/** Send command to gnuplot */
|
||||
void gnuplotCommand(const char * _command);
|
||||
|
||||
/** Send command to gnuplot
|
||||
|
||||
@overload
|
||||
*/
|
||||
void gnuplotCommand(std::string _command)
|
||||
{ gnuplotCommand(_command.c_str()); }
|
||||
|
||||
|
||||
protected:
|
||||
void initGnuPlot(std::string _title, std::string _extra);
|
||||
// the private data
|
||||
bool firstTime; // the stats might be unknown in Ctor
|
||||
PCom *gpCom; // Communication with gnuplot OK
|
||||
private:
|
||||
|
||||
/** Initialize gnuplot
|
||||
|
||||
@param _title Title for gnuplot window.
|
||||
@param _extra Extra parameters to gnuplot.
|
||||
*/
|
||||
void initGnuPlot(std::string _title, std::string _extra);
|
||||
|
||||
/** The stats might be unknown in Ctor */
|
||||
bool firstTime;
|
||||
|
||||
/** Communication with gnuplot OK */
|
||||
PCom *gpCom;
|
||||
|
||||
/** Internal counter for gnuplot windows */
|
||||
static unsigned numWindow;
|
||||
};
|
||||
|
||||
// the following should be placed in a separate eoGnuplot.cpp
|
||||
|
||||
static unsigned numWindow=0;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
inline void eoGnuplot::initGnuPlot(std::string _title, std::string _extra)
|
||||
/////////////////////////////////////////////////////////
|
||||
{
|
||||
std::ostringstream os;
|
||||
os << "250x150-0+" << numWindow*170;
|
||||
numWindow++;
|
||||
char *args[6];
|
||||
args[0] = strdup( "gnuplot" );
|
||||
args[1] = strdup( "-geometry" );
|
||||
args[2] = strdup( os.str().c_str());
|
||||
args[3] = strdup( "-title" );
|
||||
args[4] = strdup( _title.c_str() );
|
||||
args[5] = 0;
|
||||
gpCom = PipeComOpenArgv( "gnuplot", args );
|
||||
if( ! gpCom )
|
||||
throw std::runtime_error("Impossible to spawn gnuplot\n");
|
||||
else {
|
||||
PipeComSend( gpCom, "set grid\n" );
|
||||
PipeComSend( gpCom, _extra.c_str() );
|
||||
PipeComSend( gpCom, "\n" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// the following should be placed in a separate file pipecom.c
|
||||
// together with the corresponding pipecom.h
|
||||
// but first their MSC equivalent must be written and tested
|
||||
// or some #idef instructions put with clear message at compile time
|
||||
// that this is for Unix only ???
|
||||
|
||||
/* ----------------------------------------------------------------------
|
||||
* Where........: CMAP - Polytechnique
|
||||
* File.........: pipecom.c
|
||||
* Author.......: Bertrand Lamy (Equipe genetique)
|
||||
* Created......: Mon Mar 13 13:50:11 1995
|
||||
* Description..: Communication par pipe bidirectionnel avec un autre process
|
||||
*
|
||||
* Ident........: $Id: eoGnuplot.h,v 1.13 2005-09-28 21:49:26 kuepper Exp $
|
||||
* ----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
|
||||
// #include "pipecom.h"
|
||||
|
||||
|
||||
inline int Check( PCom *com )
|
||||
{
|
||||
if( ! com ) {
|
||||
fprintf( stderr, "PipeCom: Null pointer.\n" );
|
||||
fflush( stderr );
|
||||
return 0;
|
||||
}
|
||||
if( kill( com->pid, 0 ) != 0 ) {
|
||||
fprintf( stderr, "PipeCom: process doesn't exists.\n" );
|
||||
fflush( stderr );
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
inline PCom * PipeComOpen( char *prog )
|
||||
{
|
||||
char *args[2];
|
||||
args[0] = prog;
|
||||
args[1] = NULL;
|
||||
return PipeComOpenArgv( prog, args );
|
||||
}
|
||||
|
||||
|
||||
inline PCom * PipeComOpenArgv( char *prog, char *argv[] )
|
||||
{
|
||||
int toFils[2];
|
||||
int toPere[2];
|
||||
int sonPid;
|
||||
PCom * ret = NULL;
|
||||
|
||||
if( pipe( toFils ) < 0 ) {
|
||||
perror( "PipeComOpen: Creating pipes" );
|
||||
return ret;
|
||||
}
|
||||
if( pipe( toPere ) < 0 ) {
|
||||
perror( "PipeComOpen: Creating pipes" );
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch( (sonPid = vfork()) ) {
|
||||
case -1:
|
||||
perror("PipeComOpen: fork failed" );
|
||||
return ret;
|
||||
break;
|
||||
|
||||
case 0:
|
||||
/* --- Here's the son --- */
|
||||
/* --- replace old stdin --- */
|
||||
if( dup2( toFils[0], fileno(stdin) ) < 0 ) {
|
||||
perror( "PipeComOpen(son): could not connect" );
|
||||
exit( -1 );
|
||||
/* --- AVOIR: kill my father --- */
|
||||
}
|
||||
if( dup2( toPere[1], fileno(stdout) ) < 0 ) {
|
||||
perror( "PipeComOpen(son): could not connect" );
|
||||
exit( -1 );
|
||||
}
|
||||
if( execvp( prog, argv ) < 0 ) {
|
||||
perror( prog );
|
||||
perror( "PipeComOpen: can't exec" );
|
||||
exit(1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
ret = (PCom *) malloc( sizeof(PCom) );
|
||||
if( ! ret )
|
||||
return NULL;
|
||||
|
||||
ret->fWrit = (FILE *)fdopen( toFils[1], "w" );
|
||||
ret->fRead = (FILE *)fdopen( toPere[0], "r" );
|
||||
ret->pid = sonPid;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
inline int PipeComSend( PCom *to, const char *line )
|
||||
{
|
||||
int nb = 0;
|
||||
if( ! Check(to ) )
|
||||
return nb;
|
||||
nb = fprintf( to->fWrit, line );
|
||||
fflush( to->fWrit );
|
||||
return nb;
|
||||
}
|
||||
|
||||
|
||||
inline int PipeComSendn( PCom *to, const char *data, int n )
|
||||
{
|
||||
int nb = 0;
|
||||
if( ! Check(to) )
|
||||
return nb;
|
||||
|
||||
nb = fwrite( data, 1, n, to->fWrit );
|
||||
fflush( to->fWrit );
|
||||
return nb;
|
||||
}
|
||||
|
||||
|
||||
inline int PipeComReceive( PCom *from, char *data, int max )
|
||||
{
|
||||
if( ! Check(from) )
|
||||
return 0;
|
||||
if( ! data ) {
|
||||
fprintf( stderr, "PipeComReceive: Invalid data pointer\n" );
|
||||
fflush( stderr );
|
||||
return 0;
|
||||
}
|
||||
if( fgets( data, max, from->fRead ) )
|
||||
return strlen(data);
|
||||
return 0;
|
||||
}
|
||||
#endif // EO_eoGnuplot_H
|
||||
|
||||
|
||||
|
||||
inline int PipeComClose( PCom *to )
|
||||
{
|
||||
if( ! Check(to) )
|
||||
return 0;
|
||||
fclose( to->fRead );
|
||||
fclose( to->fWrit );
|
||||
free( to );
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
inline int PipeComWaitFor( PCom *from, char *what )
|
||||
{
|
||||
char buffer[256];
|
||||
do {
|
||||
if( ! PipeComReceive( from, buffer, 256 ) )
|
||||
return 0;
|
||||
} while( strcmp( buffer, what ) );
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
// Local Variables:
|
||||
// c-file-style: "Stroustrup"
|
||||
// comment-column: 35
|
||||
// fill-column: 80
|
||||
// mode: C++
|
||||
// End:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue