projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.xmppstream: Optimized stanza building by bypassing the stanza API.
[prosody.git]
/
util
/
xmppstream.lua
diff --git
a/util/xmppstream.lua
b/util/xmppstream.lua
index d22c923b6f7987781556d5863331ccda4a95379e..a13e9d3268e87a8ab3ff58754c87c262510bb028 100644
(file)
--- a/
util/xmppstream.lua
+++ b/
util/xmppstream.lua
@@
-9,12
+9,15
@@
local lxp = require "lxp";
local st = require "util.stanza";
local lxp = require "lxp";
local st = require "util.stanza";
+local stanza_mt = st.stanza_mt;
local tostring = tostring;
local t_insert = table.insert;
local t_concat = table.concat;
local tostring = tostring;
local t_insert = table.insert;
local t_concat = table.concat;
+local t_remove = table.remove;
+local setmetatable = setmetatable;
-local default_log = require "util.logger".init("xm
lhandlers
");
+local default_log = require "util.logger".init("xm
ppstream
");
local error = error;
local error = error;
@@
-31,6
+34,9
@@
local xmlns_streams = "http://etherx.jabber.org/streams";
local ns_separator = "\1";
local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
local ns_separator = "\1";
local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
+_M.ns_separator = ns_separator;
+_M.ns_pattern = ns_pattern;
+
function new_sax_handlers(session, stream_callbacks)
local xml_handlers = {};
function new_sax_handlers(session, stream_callbacks)
local xml_handlers = {};
@@
-42,16
+48,21
@@
function new_sax_handlers(session, stream_callbacks)
local cb_handlestanza = stream_callbacks.handlestanza;
local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
local cb_handlestanza = stream_callbacks.handlestanza;
local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
- local stream_tag = stream_ns..ns_separator..(stream_callbacks.stream_tag or "stream");
+ local stream_tag = stream_callbacks.stream_tag or "stream";
+ if stream_ns ~= "" then
+ stream_tag = stream_ns..ns_separator..stream_tag;
+ end
local stream_error_tag = stream_ns..ns_separator..(stream_callbacks.error_tag or "error");
local stream_default_ns = stream_callbacks.default_ns;
local stream_error_tag = stream_ns..ns_separator..(stream_callbacks.error_tag or "error");
local stream_default_ns = stream_callbacks.default_ns;
+ local stack = {};
local chardata, stanza = {};
local chardata, stanza = {};
+ local non_streamns_depth = 0;
function xml_handlers:StartElement(tagname, attr)
if stanza and #chardata > 0 then
-- We have some character data in the buffer
function xml_handlers:StartElement(tagname, attr)
if stanza and #chardata > 0 then
-- We have some character data in the buffer
-
stanza:text(
t_concat(chardata));
+
t_insert(stanza,
t_concat(chardata));
chardata = {};
end
local curr_ns,name = tagname:match(ns_pattern);
chardata = {};
end
local curr_ns,name = tagname:match(ns_pattern);
@@
-59,8
+70,9
@@
function new_sax_handlers(session, stream_callbacks)
curr_ns, name = "", curr_ns;
end
curr_ns, name = "", curr_ns;
end
- if curr_ns ~= stream_default_ns then
+ if curr_ns ~= stream_default_ns
or non_streamns_depth > 0
then
attr.xmlns = curr_ns;
attr.xmlns = curr_ns;
+ non_streamns_depth = non_streamns_depth + 1;
end
-- FIXME !!!!!
end
-- FIXME !!!!!
@@
-69,8
+81,8
@@
function new_sax_handlers(session, stream_callbacks)
attr[i] = nil;
local ns, nm = k:match(ns_pattern);
if nm ~= "" then
attr[i] = nil;
local ns, nm = k:match(ns_pattern);
if nm ~= "" then
- ns = ns_prefixes[ns];
- if ns then
+ ns = ns_prefixes[ns];
+ if ns then
attr[ns..":"..nm] = attr[k];
attr[k] = nil;
end
attr[ns..":"..nm] = attr[k];
attr[k] = nil;
end
@@
-80,6
+92,7
@@
function new_sax_handlers(session, stream_callbacks)
if not stanza then --if we are not currently inside a stanza
if session.notopen then
if tagname == stream_tag then
if not stanza then --if we are not currently inside a stanza
if session.notopen then
if tagname == stream_tag then
+ non_streamns_depth = 0;
if cb_streamopened then
cb_streamopened(session, attr);
end
if cb_streamopened then
cb_streamopened(session, attr);
end
@@
-93,9
+106,13
@@
function new_sax_handlers(session, stream_callbacks)
cb_error(session, "invalid-top-level-element");
end
cb_error(session, "invalid-top-level-element");
end
- stanza = s
t.stanza(name, attr
);
+ stanza = s
etmetatable({ name = name, attr = attr, tags = {} }, stanza_mt
);
else -- we are inside a stanza, so add a tag
else -- we are inside a stanza, so add a tag
- stanza:tag(name, attr);
+ t_insert(stack, stanza);
+ local oldstanza = stanza;
+ stanza = setmetatable({ name = name, attr = attr, tags = {} }, stanza_mt);
+ t_insert(oldstanza, stanza);
+ t_insert(oldstanza.tags, stanza);
end
end
function xml_handlers:CharacterData(data)
end
end
function xml_handlers:CharacterData(data)
@@
-104,14
+121,17
@@
function new_sax_handlers(session, stream_callbacks)
end
end
function xml_handlers:EndElement(tagname)
end
end
function xml_handlers:EndElement(tagname)
+ if non_streamns_depth > 0 then
+ non_streamns_depth = non_streamns_depth - 1;
+ end
if stanza then
if #chardata > 0 then
-- We have some character data in the buffer
if stanza then
if #chardata > 0 then
-- We have some character data in the buffer
-
stanza:text(
t_concat(chardata));
+
t_insert(stanza,
t_concat(chardata));
chardata = {};
end
-- Complete stanza
chardata = {};
end
-- Complete stanza
- if #sta
nza.last_add
== 0 then
+ if #sta
ck
== 0 then
if tagname ~= stream_error_tag then
cb_handlestanza(session, stanza);
else
if tagname ~= stream_error_tag then
cb_handlestanza(session, stanza);
else
@@
-119,7
+139,7
@@
function new_sax_handlers(session, stream_callbacks)
end
stanza = nil;
else
end
stanza = nil;
else
- stanza
:up(
);
+ stanza
= t_remove(stack
);
end
else
if tagname == stream_tag then
end
else
if tagname == stream_tag then
@@
-134,11
+154,13
@@
function new_sax_handlers(session, stream_callbacks)
cb_error(session, "parse-error", "unexpected-element-close", name);
end
stanza, chardata = nil, {};
cb_error(session, "parse-error", "unexpected-element-close", name);
end
stanza, chardata = nil, {};
+ stack = {};
end
end
local function reset()
stanza, chardata = nil, {};
end
end
local function reset()
stanza, chardata = nil, {};
+ stack = {};
end
local function set_session(stream, new_session)
end
local function set_session(stream, new_session)