summaryrefslogtreecommitdiffstats
path: root/grapher/StapParser.hxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-11-03 16:22:36 -0500
committerDave Brolley <brolley@redhat.com>2009-11-03 16:22:36 -0500
commit899b66209b0146560f0efc33efe58a4be3577df3 (patch)
tree7b64764b917c359a99d0adcf6c68a2d73cd52be7 /grapher/StapParser.hxx
parentd4ad7984018ff769cbb662342be7e501632c0bea (diff)
parent89651893a8ec51ee4d77ddfd57019e350ad7b169 (diff)
downloadsystemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.gz
systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.xz
systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts: Makefile.in configure doc/Makefile.in doc/SystemTap_Tapset_Reference/Makefile.in grapher/Makefile.in testsuite/configure
Diffstat (limited to 'grapher/StapParser.hxx')
-rw-r--r--grapher/StapParser.hxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/grapher/StapParser.hxx b/grapher/StapParser.hxx
index f4f6bdef..40add9fd 100644
--- a/grapher/StapParser.hxx
+++ b/grapher/StapParser.hxx
@@ -10,17 +10,23 @@ class StapParser
typedef std::map<std::string, std::tr1::shared_ptr<GraphDataBase> > DataMap;
DataMap _dataSets;
CSVData _csv;
- Gtk::Window& _win;
- GraphWidget& _widget;
+ Gtk::Window* _win;
+ GraphWidget* _widget;
int _errFd;
+ int _inFd;
public:
- StapParser(Gtk::Window& win,
- GraphWidget& widget) : _win(win), _widget(widget), _errFd(-1) {}
+ StapParser(Gtk::Window* win,
+ GraphWidget* widget) : _win(win), _widget(widget), _errFd(-1),
+ _inFd(-1)
+ {
+ }
void parseData(std::tr1::shared_ptr<GraphDataBase> gdata,
double time, const std::string& dataString);
bool ioCallback(Glib::IOCondition ioCondition);
bool errIoCallback(Glib::IOCondition ioCondition);
int getErrFd() { return _errFd; }
void setErrFd(int fd) { _errFd = fd; }
+ int getInFd() { return _inFd; }
+ void setInFd(int fd) { _inFd = fd; }
};
}