diff options
| author | Tim Moore <timoore@redhat.com> | 2009-10-21 17:05:59 +0200 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-10-27 13:00:59 +0100 |
| commit | 4bf8ba6e4fc0a950301e5debedababa834ea0d10 (patch) | |
| tree | de83f883f05be61698ca57fa94a2af05b3751e17 /grapher/StapParser.cxx | |
| parent | 6fb95a63ecfa32b1524790ee42695f19773f2174 (diff) | |
| download | systemtap-steved-4bf8ba6e4fc0a950301e5debedababa834ea0d10.tar.gz systemtap-steved-4bf8ba6e4fc0a950301e5debedababa834ea0d10.tar.xz systemtap-steved-4bf8ba6e4fc0a950301e5debedababa834ea0d10.zip | |
More refactoring for multiple stap processes.
* grapher/StapParser.hxx (StapParser): Change _win and _widget from
references to pointers.
* grapher/StapParser.cxx (ioCallback): Ditto.
* grapher/grapher.cxx (StapLauncher, GraphicalStapLauncher): Rewrite
to make GraphicalStapLauncher a derived class of StapLauncher.
(main): Accept graphing data from stdin with a "-" argument.
Diffstat (limited to 'grapher/StapParser.cxx')
| -rw-r--r-- | grapher/StapParser.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/grapher/StapParser.cxx b/grapher/StapParser.cxx index eea85006..249836d3 100644 --- a/grapher/StapParser.cxx +++ b/grapher/StapParser.cxx @@ -63,7 +63,7 @@ vector<string> commaSplit(const boost::sub_range<Glib::ustring>& range) using namespace boost; if (ioCondition & Glib::IO_HUP) { - _win.hide(); + _win->hide(); return true; } if ((ioCondition & Glib::IO_IN) == 0) @@ -73,7 +73,7 @@ vector<string> commaSplit(const boost::sub_range<Glib::ustring>& range) bytes_read = read(_inFd, buf, sizeof(buf) - 1); if (bytes_read <= 0) { - _win.hide(); + _win->hide(); return true; } buf[bytes_read] = '\0'; @@ -108,7 +108,7 @@ vector<string> commaSplit(const boost::sub_range<Glib::ustring>& range) dataSet->color[2] = (hexColor & 0xff) / 255.0; dataSet->scale = scale; _dataSets.insert(std::make_pair(setName, dataSet)); - _widget.addGraphData(dataSet); + _widget->addGraphData(dataSet); } else if (style == "discreet") { @@ -120,7 +120,7 @@ vector<string> commaSplit(const boost::sub_range<Glib::ustring>& range) dataSet->color[2] = (hexColor & 0xff) / 255.0; dataSet->scale = scale; _dataSets.insert(std::make_pair(setName, dataSet)); - _widget.addGraphData(dataSet); + _widget->addGraphData(dataSet); } } else if ((found = find_first(dataString, "%CSV:"))) @@ -219,7 +219,7 @@ vector<string> commaSplit(const boost::sub_range<Glib::ustring>& range) bytes_read = read(_errFd, buf, sizeof(buf) - 1); if (bytes_read <= 0) { - _win.hide(); + _win->hide(); return true; } if (write(STDOUT_FILENO, buf, bytes_read) < 0) |