Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 44 insertions, 0 deletions

diff --git a/grapher/GraphData.hxx b/grapher/GraphData.hxx
new file mode 100644
index 00000000..0f3b0b31
--- /dev/null
+++ b/grapher/GraphData.hxx
@@ -0,0 +1,44 @@
+#ifndef SYSTEMTAP_GRAPHDATA_HXX
+#define SYSTEMTAP_GRAPHDATA_HXX 1
+
+#include <utility>
+#include <vector>
+
+namespace systemtap
+{
+  struct GraphData
+  {
+  public:
+    enum Style
+      { BAR,
+        DOT
+      };
+    GraphData() : scale(1.0), style(BAR)
+    {
+      color[0] = 0.0;  color[1] = 1.0;  color[2] = 0.0;
+    }
+    typedef std::pair<double, double> Datum;
+    typedef std::vector<Datum> List;
+    // size of grid square at "normal" viewing
+    double scale;
+    double color[3];
+    Style style;
+    List data;
+    struct Compare
+    {
+      bool operator() (const Datum& lhs, const Datum& rhs) const
+      {
+        return lhs.first < rhs.first;
+      }
+      bool operator() (double lhs, const Datum& rhs) const
+      {
+        return lhs < rhs.first;
+      }
+      bool operator() (const Datum& lhs, double rhs) const
+      {
+        return lhs.first < rhs;
+      }
+    };
+  };
+}
+#endif