summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/CMakeLists.txt1
-rw-r--r--lib/json_parser.cpp36
-rw-r--r--lib/json_parser_read_104900.hpp331
-rw-r--r--lib/top_block_query.cpp48
-rw-r--r--query/__init__.py14
-rw-r--r--query/chart_factory.js9
-rw-r--r--query/main.js2
-rw-r--r--tests/query_test.py14
8 files changed, 408 insertions, 47 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f23d6ea..add46db 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -65,6 +65,7 @@ list(APPEND GRAS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/hier_block.cpp
${CMAKE_CURRENT_SOURCE_DIR}/top_block.cpp
${CMAKE_CURRENT_SOURCE_DIR}/top_block_query.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/json_parser.cpp
${CMAKE_CURRENT_SOURCE_DIR}/register_messages.cpp
${CMAKE_CURRENT_SOURCE_DIR}/weak_container.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serialize_types.cpp
diff --git a/lib/json_parser.cpp b/lib/json_parser.cpp
new file mode 100644
index 0000000..4a75f3d
--- /dev/null
+++ b/lib/json_parser.cpp
@@ -0,0 +1,36 @@
+// Copyright (C) by Josh Blum. See LICENSE.txt for licensing information.
+
+//--------- begin bullshit --------------//
+#include <boost/version.hpp>
+//why the fuck does no OS ever patch boost when there is a bug
+//https://svn.boost.org/trac/boost/ticket/6785
+#if BOOST_VERSION == 104900
+#include "json_parser_read_104900.hpp"
+#endif
+//--------- end bullshit --------------//
+
+#include "gras_impl/debug.hpp"
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/regex.hpp>
+#include <sstream>
+#include <string>
+
+boost::property_tree::ptree json_to_ptree(const std::string &s)
+{
+ std::stringstream ss(s);
+ boost::property_tree::ptree pt;
+ boost::property_tree::json_parser::read_json(ss, pt);
+ return pt;
+}
+
+//http://stackoverflow.com/questions/13464383/boost-property-write-json-incorrect-behaviour
+std::string ptree_to_json(const boost::property_tree::ptree &p)
+{
+ boost::regex exp("\"(null|true|false|[0-9]+(\\.[0-9]+)?)\"");
+ std::stringstream ss;
+ boost::property_tree::json_parser::write_json(ss, p);
+ std::string rv = boost::regex_replace(ss.str(), exp, "$1");
+
+ return rv;
+}
diff --git a/lib/json_parser_read_104900.hpp b/lib/json_parser_read_104900.hpp
new file mode 100644
index 0000000..f7c6515
--- /dev/null
+++ b/lib/json_parser_read_104900.hpp
@@ -0,0 +1,331 @@
+// ----------------------------------------------------------------------------
+// Copyright (C) 2002-2006 Marcin Kalicinski
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// For more information, see www.boost.org
+// ----------------------------------------------------------------------------
+#ifndef BOOST_PROPERTY_TREE_DETAIL_JSON_PARSER_READ_HPP_INCLUDED
+#define BOOST_PROPERTY_TREE_DETAIL_JSON_PARSER_READ_HPP_INCLUDED
+
+//#define BOOST_SPIRIT_DEBUG
+
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/detail/ptree_utils.hpp>
+#include <boost/property_tree/detail/json_parser_error.hpp>
+#include <boost/spirit/include/classic.hpp>
+#include <boost/limits.hpp>
+#include <string>
+#include <locale>
+#include <istream>
+#include <vector>
+#include <algorithm>
+
+namespace boost { namespace property_tree { namespace json_parser
+{
+
+ ///////////////////////////////////////////////////////////////////////
+ // Json parser context
+
+ template<class Ptree>
+ struct context
+ {
+
+ typedef typename Ptree::key_type::value_type Ch;
+ typedef std::basic_string<Ch> Str;
+ typedef typename std::vector<Ch>::iterator It;
+
+ Str string;
+ Str name;
+ Ptree root;
+ std::vector<Ptree *> stack;
+
+ struct a_object_s
+ {
+ context &c;
+ a_object_s(context &c): c(c) { }
+ void operator()(Ch) const
+ {
+ if (c.stack.empty())
+ c.stack.push_back(&c.root);
+ else
+ {
+ Ptree *parent = c.stack.back();
+ Ptree *child = &parent->push_back(std::make_pair(c.name, Ptree()))->second;
+ c.stack.push_back(child);
+ c.name.clear();
+ }
+ }
+ };
+
+ struct a_object_e
+ {
+ context &c;
+ a_object_e(context &c): c(c) { }
+ void operator()(Ch) const
+ {
+ BOOST_ASSERT(c.stack.size() >= 1);
+ c.stack.pop_back();
+ }
+ };
+
+ struct a_name
+ {
+ context &c;
+ a_name(context &c): c(c) { }
+ void operator()(It, It) const
+ {
+ c.name.swap(c.string);
+ c.string.clear();
+ }
+ };
+
+ struct a_string_val
+ {
+ context &c;
+ a_string_val(context &c): c(c) { }
+ void operator()(It, It) const
+ {
+ BOOST_ASSERT(c.stack.size() >= 1);
+ c.stack.back()->push_back(std::make_pair(c.name, Ptree(c.string)));
+ c.name.clear();
+ c.string.clear();
+ }
+ };
+
+ struct a_literal_val
+ {
+ context &c;
+ a_literal_val(context &c): c(c) { }
+ void operator()(It b, It e) const
+ {
+ BOOST_ASSERT(c.stack.size() >= 1);
+ c.stack.back()->push_back(std::make_pair(c.name, Ptree(Str(b, e))));
+ c.name.clear();
+ c.string.clear();
+ }
+ };
+
+ struct a_char
+ {
+ context &c;
+ a_char(context &c): c(c) { }
+ void operator()(It b, It e) const
+ {
+ c.string += *b;
+ }
+ };
+
+ struct a_escape
+ {
+ context &c;
+ a_escape(context &c): c(c) { }
+ void operator()(Ch ch) const
+ {
+ switch (ch)
+ {
+ case Ch('\"'): c.string += Ch('\"'); break;
+ case Ch('\\'): c.string += Ch('\\'); break;
+ case Ch('/'): c.string += Ch('/'); break;
+ case Ch('b'): c.string += Ch('\b'); break;
+ case Ch('f'): c.string += Ch('\f'); break;
+ case Ch('n'): c.string += Ch('\n'); break;
+ case Ch('r'): c.string += Ch('\r'); break;
+ case Ch('t'): c.string += Ch('\t'); break;
+ default: BOOST_ASSERT(0);
+ }
+ }
+ };
+
+ struct a_unicode
+ {
+ context &c;
+ a_unicode(context &c): c(c) { }
+ void operator()(unsigned long u) const
+ {
+ u = (std::min)(u, static_cast<unsigned long>((std::numeric_limits<Ch>::max)()));
+ c.string += Ch(u);
+ }
+ };
+
+ };
+
+ ///////////////////////////////////////////////////////////////////////
+ // Json grammar
+
+ template<class Ptree>
+ struct json_grammar :
+ public boost::spirit::classic::grammar<json_grammar<Ptree> >
+ {
+
+ typedef context<Ptree> Context;
+ typedef typename Ptree::key_type::value_type Ch;
+
+ mutable Context c;
+
+ template<class Scanner>
+ struct definition
+ {
+
+ boost::spirit::classic::rule<Scanner>
+ root, object, member, array, item, value, string, number;
+ boost::spirit::classic::rule<
+ typename boost::spirit::classic::lexeme_scanner<Scanner>::type>
+ character, escape;
+
+ definition(const json_grammar &self)
+ {
+
+ using namespace boost::spirit::classic;
+ // There's a boost::assertion too, so another explicit using
+ // here:
+ using boost::spirit::classic::assertion;
+
+ // Assertions
+ assertion<std::string> expect_root("expected object or array");
+ assertion<std::string> expect_eoi("expected end of input");
+ assertion<std::string> expect_objclose("expected ',' or '}'");
+ assertion<std::string> expect_arrclose("expected ',' or ']'");
+ assertion<std::string> expect_name("expected object name");
+ assertion<std::string> expect_colon("expected ':'");
+ assertion<std::string> expect_value("expected value");
+ assertion<std::string> expect_escape("invalid escape sequence");
+
+ // JSON grammar rules
+ root
+ = expect_root(object | array)
+ >> expect_eoi(end_p)
+ ;
+
+ object
+ = ch_p('{')[typename Context::a_object_s(self.c)]
+ >> (ch_p('}')[typename Context::a_object_e(self.c)]
+ | (list_p(member, ch_p(','))
+ >> expect_objclose(ch_p('}')[typename Context::a_object_e(self.c)])
+ )
+ )
+ ;
+
+ member
+ = expect_name(string[typename Context::a_name(self.c)])
+ >> expect_colon(ch_p(':'))
+ >> expect_value(value)
+ ;
+
+ array
+ = ch_p('[')[typename Context::a_object_s(self.c)]
+ >> (ch_p(']')[typename Context::a_object_e(self.c)]
+ | (list_p(item, ch_p(','))
+ >> expect_arrclose(ch_p(']')[typename Context::a_object_e(self.c)])
+ )
+ )
+ ;
+
+ item
+ = expect_value(value)
+ ;
+
+ value
+ = string[typename Context::a_string_val(self.c)]
+ | (number | str_p("true") | "false" | "null")[typename Context::a_literal_val(self.c)]
+ | object
+ | array
+ ;
+
+ number
+ = !ch_p("-") >>
+ (ch_p("0") | (range_p(Ch('1'), Ch('9')) >> *digit_p)) >>
+ !(ch_p(".") >> +digit_p) >>
+ !(chset_p(detail::widen<Ch>("eE").c_str()) >>
+ !chset_p(detail::widen<Ch>("-+").c_str()) >>
+ +digit_p)
+ ;
+
+ string
+ = +(lexeme_d[confix_p('\"', *character, '\"')])
+ ;
+
+ character
+ = (anychar_p - "\\" - "\"")
+ [typename Context::a_char(self.c)]
+ | ch_p("\\") >> expect_escape(escape)
+ ;
+
+ escape
+ = chset_p(detail::widen<Ch>("\"\\/bfnrt").c_str())
+ [typename Context::a_escape(self.c)]
+ | 'u' >> uint_parser<unsigned long, 16, 4, 4>()
+ [typename Context::a_unicode(self.c)]
+ ;
+
+ // Debug
+ BOOST_SPIRIT_DEBUG_RULE(root);
+ BOOST_SPIRIT_DEBUG_RULE(object);
+ BOOST_SPIRIT_DEBUG_RULE(member);
+ BOOST_SPIRIT_DEBUG_RULE(array);
+ BOOST_SPIRIT_DEBUG_RULE(item);
+ BOOST_SPIRIT_DEBUG_RULE(value);
+ BOOST_SPIRIT_DEBUG_RULE(string);
+ BOOST_SPIRIT_DEBUG_RULE(number);
+ BOOST_SPIRIT_DEBUG_RULE(escape);
+ BOOST_SPIRIT_DEBUG_RULE(character);
+
+ }
+
+ const boost::spirit::classic::rule<Scanner> &start() const
+ {
+ return root;
+ }
+
+ };
+
+ };
+
+ template<class It, class Ch>
+ unsigned long count_lines(It begin, It end)
+ {
+ return static_cast<unsigned long>(std::count(begin, end, Ch('\n')) + 1);
+ }
+
+ template<class Ptree>
+ void read_json_internal(std::basic_istream<typename Ptree::key_type::value_type> &stream,
+ Ptree &pt,
+ const std::string &filename)
+ {
+
+ using namespace boost::spirit::classic;
+ typedef typename Ptree::key_type::value_type Ch;
+ typedef typename std::vector<Ch>::iterator It;
+
+ // Load data into vector
+ std::vector<Ch> v(std::istreambuf_iterator<Ch>(stream.rdbuf()),
+ std::istreambuf_iterator<Ch>());
+ if (!stream.good())
+ BOOST_PROPERTY_TREE_THROW(json_parser_error("read error", filename, 0));
+
+ // Prepare grammar
+ json_grammar<Ptree> g;
+
+ // Parse
+ try
+ {
+ parse_info<It> pi = parse(v.begin(), v.end(), g,
+ space_p | comment_p("//") | comment_p("/*", "*/"));
+ if (!pi.hit || !pi.full)
+ BOOST_PROPERTY_TREE_THROW((parser_error<std::string, It>(v.begin(), "syntax error")));
+ }
+ catch (parser_error<std::string, It> &e)
+ {
+ BOOST_PROPERTY_TREE_THROW(json_parser_error(e.descriptor, filename, count_lines<It, Ch>(v.begin(), e.where)));
+ }
+
+ // Swap grammar context root and pt
+ pt.swap(g.c.root);
+
+ }
+
+} } }
+
+#endif
diff --git a/lib/top_block_query.cpp b/lib/top_block_query.cpp
index 8634f20..671168c 100644
--- a/lib/top_block_query.cpp
+++ b/lib/top_block_query.cpp
@@ -4,12 +4,8 @@
#include <gras/top_block.hpp>
#include <boost/foreach.hpp>
#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/xml_parser.hpp>
-#include <boost/regex.hpp>
#include <Theron/DefaultAllocator.h>
#include <algorithm>
-#include <sstream>
using namespace gras;
@@ -30,18 +26,7 @@ struct GetStatsReceiver : Theron::Receiver
std::vector<GetStatsMessage> messages;
};
-//http://stackoverflow.com/questions/13464383/boost-property-write-json-incorrect-behaviour
-static std::string my_write_json(const boost::property_tree::ptree &pt)
-{
- boost::regex exp("\"(null|true|false|[0-9]+(\\.[0-9]+)?)\"");
- std::stringstream ss;
- boost::property_tree::json_parser::write_json(ss, pt);
- std::string rv = boost::regex_replace(ss.str(), exp, "$1");
-
- return rv;
-}
-
-static std::string query_blocks(ElementImpl *self, const boost::property_tree::ptree &)
+static boost::property_tree::ptree query_blocks(ElementImpl *self, const boost::property_tree::ptree &)
{
boost::property_tree::ptree root;
boost::property_tree::ptree e;
@@ -72,17 +57,17 @@ static std::string query_blocks(ElementImpl *self, const boost::property_tree::p
e.push_back(std::make_pair(block->block_ptr->to_string(), prop_e));
}
root.push_back(std::make_pair("blocks", e));
- return my_write_json(root);
+ return root;
}
-static std::string query_stats(ElementImpl *self, const boost::property_tree::ptree &query)
+static boost::property_tree::ptree query_stats(ElementImpl *self, const boost::property_tree::ptree &query)
{
//parse list of block ids needed in this query
std::vector<std::string> block_ids;
- BOOST_FOREACH(const boost::property_tree::ptree::value_type &v, query.get_child("args"))
+ if (query.count("blocks") != 0)
{
- if (v.first.data() == std::string("block"))
+ BOOST_FOREACH(const boost::property_tree::ptree::value_type &v, query.get_child("blocks"))
{
block_ids.push_back(v.second.get<std::string>(""));
}
@@ -171,22 +156,21 @@ static std::string query_stats(ElementImpl *self, const boost::property_tree::pt
blocks.push_back(std::make_pair(message.block_id, block));
}
root.push_back(std::make_pair("blocks", blocks));
-
- return my_write_json(root);
+ return root;
}
+boost::property_tree::ptree json_to_ptree(const std::string &s);
+std::string ptree_to_json(const boost::property_tree::ptree &p);
+
std::string TopBlock::query(const std::string &args)
{
- //why the fuck does no OS ever patch boost when there is a bug
- //https://svn.boost.org/trac/boost/ticket/6785
- //serialize the path args into xml -- but I just wanted json
- std::stringstream query_args_ss(args);
- boost::property_tree::ptree query_args_pt;
- boost::property_tree::xml_parser::read_xml(query_args_ss, query_args_pt);
+ //convert json args into property tree
+ const boost::property_tree::ptree query_args_pt = json_to_ptree(args);
//dispatch based on path arg
- std::string path = query_args_pt.get<std::string>("args.path");
- if (path == "/blocks.json") return query_blocks(this->get(), query_args_pt);
- if (path == "/stats.json") return query_stats(this->get(), query_args_pt);
- return "";
+ std::string path = query_args_pt.get<std::string>("path");
+ boost::property_tree::ptree result;
+ if (path == "/blocks.json") result = query_blocks(this->get(), query_args_pt);
+ if (path == "/stats.json") result = query_stats(this->get(), query_args_pt);
+ return ptree_to_json(result);
}
diff --git a/query/__init__.py b/query/__init__.py
index c72222b..dc3339c 100644
--- a/query/__init__.py
+++ b/query/__init__.py
@@ -35,16 +35,10 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
arg_strs = dict((str(k), str(v)) for k, v in args.iteritems())
s.wfile.write(json.dumps(arg_strs))
else:
- #why the fuck does no OS ever patch boost when there is a bug
- #https://svn.boost.org/trac/boost/ticket/6785
- #serialize the path args into xml -- but I just wanted json
- def xml_from_qs(k, v):
- if not isinstance(v, list): v = [v]
- return ''.join(['<%s>%s</%s>'%(k, v_i, k) for v_i in v])
- query_args = [xml_from_qs(k,v) for k,v in urlparse.parse_qs(o.query).iteritems()]
- query_args.append(xml_from_qs('path', path))
- xml_args = xml_from_qs('args', ''.join(query_args))
- s.wfile.write(args['top_block'].query(xml_args))
+ query_args = dict([(k,v) for k,v in urlparse.parse_qs(o.query).iteritems()])
+ query_args['path'] = path
+ json_args = json.dumps(query_args)
+ s.wfile.write(args['top_block'].query(json_args))
return
#clean up path for filesystem
diff --git a/query/chart_factory.js b/query/chart_factory.js
index d55a8fd..f3e02a7 100644
--- a/query/chart_factory.js
+++ b/query/chart_factory.js
@@ -39,7 +39,14 @@ function gras_chart_factory_update(registry, point)
registry.point = point; //store last data point
$.each(registry.active_charts, function(index, chart_info)
{
- chart_info.chart.update(point);
+ try
+ {
+ chart_info.chart.update(point);
+ }
+ catch(err)
+ {
+ //jQuery.error("gras_chart_factory_update error: " + err.message);
+ }
});
}
diff --git a/query/main.js b/query/main.js
index 116653e..3b2fe31 100644
--- a/query/main.js
+++ b/query/main.js
@@ -33,7 +33,7 @@ var gras_query_stats = function(registry)
url: "/stats.json",
dataType: "json",
traditional: true, //needed to parse data
- data: {block:gras_chart_factory_active_blocks(registry)},
+ data: {blocks:gras_chart_factory_active_blocks(registry)},
success: function(response)
{
registry.online = true;
diff --git a/tests/query_test.py b/tests/query_test.py
index 5c37bad..1874eb2 100644
--- a/tests/query_test.py
+++ b/tests/query_test.py
@@ -44,19 +44,27 @@ class QueryTest(unittest.TestCase):
self.assertEqual(vec_sink.get_vector(), (0, 9, 8, 7, 6))
- blocks_json = self.tb.query("<args><path>/blocks.json</path></args>")
+ #query the block list
+ blocks_json = self.tb.query('{"path": "/blocks.json"}')
print blocks_json
blocks_python = json.loads(blocks_json)
print blocks_python
self.assertEqual(len(blocks_python['blocks']), 2)
- stats_json = self.tb.query("<args><path>/stats.json</path></args>")
+ #pick a block to query below:
+ block_id = blocks_python['blocks'].keys()[0]
+
+ #query the stats
+ stats_json = self.tb.query(str('{"path": "/stats.json", "blocks": ["%s"]}'%block_id))
print stats_json
stats_python = json.loads(stats_json)
print stats_python
self.assertTrue('tps' in stats_python)
self.assertTrue('now' in stats_python)
+ #found the block we asked for
+ self.assertTrue(block_id in stats_python['blocks'])
+
def test_props(self):
vec_source = VectorSource(numpy.uint32, [0, 9, 8, 7, 6])
vec_sink = VectorSink(numpy.uint32)
@@ -64,7 +72,7 @@ class QueryTest(unittest.TestCase):
self.tb.connect(vec_source, block, vec_sink)
self.tb.run()
- blocks_json = self.tb.query("<args><path>/blocks.json</path></args>")
+ blocks_json = self.tb.query('{"path": "/blocks.json"}')
print blocks_json
blocks_python = json.loads(blocks_json)
print blocks_python
generated by cgit (git 2.34.1) at 2025-03-13 01:00:06 +0000