Added zmq.poller object that wraps zmq_poll() function.
Robert G. Jakabosky
15 years ago
parent
62a0c8859a
commit
bd30398861
@ -1,22 +1,27 @@
|
||||
package = "lua-zmq"
|
||||
version = "scm-1"
|
||||
source = {
|
||||
url = "git://github.com/Neopallium/lua-zmq.git"
|
||||
url = "git://github.com/Neopallium/lua-zmq.git"
|
||||
}
|
||||
description = {
|
||||
summary = "Lua bindings to zeromq2, with LuaJIT2 FFI support.",
|
||||
homepage = "http://github.com/Neopallium/lua-zmq",
|
||||
license = "MIT/X11"
|
||||
summary = "Lua bindings to zeromq2, with LuaJIT2 FFI support.",
|
||||
homepage = "http://github.com/Neopallium/lua-zmq",
|
||||
license = "MIT/X11"
|
||||
}
|
||||
dependencies = {
|
||||
"lua >= 5.1"
|
||||
"lua >= 5.1"
|
||||
}
|
||||
build = {
|
||||
type = "builtin",
|
||||
modules = {
|
||||
zmq = {
|
||||
sources = {"src/pre_generated-zmq.nobj.c"},
|
||||
libraries = {"zmq"}
|
||||
}
|
||||
}
|
||||
type = "builtin",
|
||||
modules = {
|
||||
zmq = {
|
||||
sources = {"src/pre_generated-zmq.nobj.c"},
|
||||
libraries = {"zmq"}
|
||||
}
|
||||
}
|
||||
install = {
|
||||
lua = {
|
||||
['zmq.poller'] = "src/poller.lua",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
--
|
||||
-- zmq.poller wraps the low-level zmq.zmq_poller object.
|
||||
--
|
||||
-- This wrapper simplifies the event polling loop.
|
||||
--
|
||||
|
||||
local zmq = require"zmq"
|
||||
|
||||
local setmetatable = setmetatable
|
||||
local tonumber = tonumber
|
||||
local assert = assert
|
||||
|
||||
local poller_mt = {}
|
||||
poller_mt.__index = poller_mt
|
||||
|
||||
function poller_mt:add(sock, events, cb)
|
||||
self.poller:add(sock, events)
|
||||
self.callbacks[sock] = cb
|
||||
end
|
||||
|
||||
function poller_mt:modify(sock, events, cb)
|
||||
if events ~= 0 and cb then
|
||||
self.callbacks[sock] = cb
|
||||
self.poller:modify(sock, events)
|
||||
else
|
||||
self:remove(sock)
|
||||
end
|
||||
end
|
||||
|
||||
function poller_mt:remove(sock)
|
||||
self.poller:remove(sock)
|
||||
self.callbacks[sock] = nil
|
||||
end
|
||||
|
||||
function poller_mt:poll(timeout)
|
||||
local poller = self.poller
|
||||
local status, err = poller:poll(-1)
|
||||
if not status then
|
||||
return false, err
|
||||
end
|
||||
local callbacks = self.callbacks
|
||||
while true do
|
||||
local sock, revents = poller:next_revents()
|
||||
if not sock then
|
||||
break
|
||||
end
|
||||
local cb = callbacks[sock]
|
||||
if cb then
|
||||
cb(sock, revents)
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
function poller_mt:start()
|
||||
self.is_running = true
|
||||
while self.is_running do
|
||||
self:poll(-1)
|
||||
end
|
||||
end
|
||||
|
||||
function poller_mt:stop()
|
||||
self.is_running = false
|
||||
end
|
||||
|
||||
module(...)
|
||||
|
||||
function new(pre_alloc)
|
||||
return setmetatable({
|
||||
poller = zmq.zmq_poller(pre_alloc),
|
||||
callbacks = setmetatable({}, {__mode="k"}),
|
||||
}, poller_mt)
|
||||
end
|
||||
|
||||
setmetatable(_M, {__call = function(tab, ...) return new(...) end})
|
||||
|
||||
@ -0,0 +1,386 @@
|
||||
-- Copyright (c) 2010 by Robert G. Jakabosky <bobby@sharedrealm.com>
|
||||
--
|
||||
-- Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
-- of this software and associated documentation files (the "Software"), to deal
|
||||
-- in the Software without restriction, including without limitation the rights
|
||||
-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
-- copies of the Software, and to permit persons to whom the Software is
|
||||
-- furnished to do so, subject to the following conditions:
|
||||
--
|
||||
-- The above copyright notice and this permission notice shall be included in
|
||||
-- all copies or substantial portions of the Software.
|
||||
--
|
||||
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
-- THE SOFTWARE.
|
||||
|
||||
local zmq_poller_type = [[
|
||||
typedef struct zmq_poller {
|
||||
zmq_pollitem_t *items;
|
||||
int next;
|
||||
int count;
|
||||
int free_list;
|
||||
int len;
|
||||
} zmq_poller;
|
||||
]]
|
||||
|
||||
object "zmq_poller" {
|
||||
-- store the `zmq_poller` structure in Lua userdata object
|
||||
userdata_type = "embed",
|
||||
c_source(zmq_poller_type),
|
||||
c_source[[
|
||||
#define FREE_ITEM_EVENTS_TAG 0xFFFF
|
||||
|
||||
#define ITEM_TO_INDEX(items, item) (item - (items))
|
||||
|
||||
static int poller_resize_items(zmq_poller *this, int len) {
|
||||
int old_len = this->len;
|
||||
|
||||
/* make sure new length is atleast as large as items count. */
|
||||
len = (this->count <= len) ? len : this->count;
|
||||
|
||||
/* if the new length is the same as the old length, then don't try to resize. */
|
||||
if(old_len == len) return len;
|
||||
|
||||
this->items = (zmq_pollitem_t *)realloc(this->items, len * sizeof(zmq_pollitem_t));
|
||||
this->len = len;
|
||||
if(len > old_len) {
|
||||
/* clear new space. */
|
||||
memset(&(this->items[old_len]), 0, (old_len - len) * sizeof(zmq_pollitem_t));
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
static int poller_find_sock_item(zmq_poller *this, ZMQ_Socket *sock) {
|
||||
zmq_pollitem_t *items;
|
||||
int count;
|
||||
int n;
|
||||
|
||||
/* find ZMQ_Socket */
|
||||
items = this->items;
|
||||
count = this->count;
|
||||
for(n=0; n < count; n++) {
|
||||
if(items[n].socket == sock) return n;
|
||||
}
|
||||
/* not found. */
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int poller_find_fd_item(zmq_poller *this, socket_t fd) {
|
||||
zmq_pollitem_t *items;
|
||||
int count;
|
||||
int n;
|
||||
|
||||
/* find fd */
|
||||
items = this->items;
|
||||
count = this->count;
|
||||
for(n=0; n < count; n++) {
|
||||
if(items[n].fd == fd) return n;
|
||||
}
|
||||
/* not found. */
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void poller_remove_item(zmq_poller *this, int idx) {
|
||||
zmq_pollitem_t *items;
|
||||
int free_list;
|
||||
int count;
|
||||
|
||||
count = this->count;
|
||||
/* no item to remove. */
|
||||
if(idx >= count || count == 0) return;
|
||||
|
||||
items = this->items;
|
||||
free_list = this->free_list;
|
||||
|
||||
/* link new free slot to head of free list. */
|
||||
if(free_list >= 0 && free_list < count) {
|
||||
/* use socket pointer for free list's 'next' field. */
|
||||
items[idx].socket = &(items[free_list]);
|
||||
} else {
|
||||
/* free list is empty mark this slot as the end. */
|
||||
items[idx].socket = NULL;
|
||||
}
|
||||
this->free_list = idx;
|
||||
/* mark this slot as a free slot. */
|
||||
items[idx].events = FREE_ITEM_EVENTS_TAG;
|
||||
}
|
||||
|
||||
static int poller_get_free_item(zmq_poller *this) {
|
||||
zmq_pollitem_t *curr;
|
||||
zmq_pollitem_t *next;
|
||||
int count;
|
||||
int idx;
|
||||
|
||||
count = this->count;
|
||||
idx = this->free_list;
|
||||
/* check for a free slot in the free list. */
|
||||
if(idx >= 0 && idx < count) {
|
||||
/* remove free slot from free list. */
|
||||
curr = &(this->items[idx]);
|
||||
/* valid free slot. */
|
||||
assert(curr->events == FREE_ITEM_EVENTS_TAG);
|
||||
/* is this the last free slot? */
|
||||
next = ((zmq_pollitem_t *)curr->socket);
|
||||
if(next != NULL) {
|
||||
/* set next free slot as head of free list. */
|
||||
this->free_list = ITEM_TO_INDEX(this->items, next);
|
||||
} else {
|
||||
/* free list is empty now. */
|
||||
this->free_list = -1;
|
||||
}
|
||||
/* clear slot */
|
||||
memset(curr, 0, sizeof(zmq_pollitem_t));
|
||||
return idx;
|
||||
}
|
||||
|
||||
idx = count;
|
||||
this->count = ++count;
|
||||
/* make room for new item. */
|
||||
if(count >= this->len) {
|
||||
poller_resize_items(this, this->len + 10);
|
||||
}
|
||||
return idx;
|
||||
}
|
||||
|
||||
static int poller_compact_items(zmq_poller *this) {
|
||||
zmq_pollitem_t *items;
|
||||
int count;
|
||||
int old_count;
|
||||
int next;
|
||||
|
||||
count = this->count;
|
||||
/* if no free slot, then return. */
|
||||
if(this->free_list < 0) return count;
|
||||
old_count = count;
|
||||
|
||||
items = this->items;
|
||||
next = 0;
|
||||
/* find first free slot. */
|
||||
while(items[next].events != FREE_ITEM_EVENTS_TAG) {
|
||||
assert(next <= old_count);
|
||||
++next;
|
||||
}
|
||||
|
||||
/* move non-free slots into free slot. */
|
||||
count = next;
|
||||
++next;
|
||||
while(next <= old_count) {
|
||||
if(items[next].events != FREE_ITEM_EVENTS_TAG) {
|
||||
/* found non-free slot, move it to the current free slot. */
|
||||
items[count] = items[next];
|
||||
++count;
|
||||
}
|
||||
++next;
|
||||
}
|
||||
|
||||
/* clear old used-space */
|
||||
memset(&(items[count]), 0, ((old_count - count) * sizeof(zmq_pollitem_t)));
|
||||
this->count = count;
|
||||
this->free_list = -1; /* free list is now empty. */
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static int poller_poll(zmq_poller *this, long timeout) {
|
||||
int count;
|
||||
/* remove free slots from items list. */
|
||||
count = poller_compact_items(this);
|
||||
/* poll for events. */
|
||||
return zmq_poll(this->items, count, timeout);
|
||||
}
|
||||
|
||||
]],
|
||||
ffi_export_function "int" "poller_find_sock_item" "(zmq_poller *this, ZMQ_Socket *sock)",
|
||||
ffi_export_function "int" "poller_find_fd_item" "(zmq_poller *this, socket_t fd)",
|
||||
ffi_export_function "int" "poller_get_free_item" "(zmq_poller *this)",
|
||||
ffi_export_function "int" "poller_poll" "(zmq_poller *this, long timeout)",
|
||||
ffi_export_function "void" "poller_remove_item" "(zmq_poller *this, int idx)",
|
||||
--
|
||||
-- Define zmq_poller type & function API for FFI
|
||||
--
|
||||
ffi_cdef[[
|
||||
typedef struct zmq_pollitem_t {
|
||||
ZMQ_Socket socket;
|
||||
socket_t fd;
|
||||
short events;
|
||||
short revents;
|
||||
} zmq_pollitem_t;
|
||||
|
||||
int zmq_poll(zmq_pollitem_t *items, int nitems, long timeout);
|
||||
]],
|
||||
ffi_cdef(zmq_poller_type),
|
||||
|
||||
constructor "new" {
|
||||
var_in{ "unsigned int", "length", is_optional = true, default = 10 },
|
||||
c_source[[
|
||||
zmq_poller poller;
|
||||
${this} = &poller;
|
||||
${this}->items = (zmq_pollitem_t *)calloc(${length}, sizeof(zmq_pollitem_t));
|
||||
${this}->next = -1;
|
||||
${this}->count = 0;
|
||||
${this}->len = ${length};
|
||||
${this}->free_list = -1;
|
||||
]],
|
||||
},
|
||||
destructor "close" {
|
||||
c_source[[
|
||||
free(${this}->items);
|
||||
${this}->items = NULL;
|
||||
${this}->next = -1;
|
||||
${this}->count = 0;
|
||||
${this}->len = 0;
|
||||
${this}->free_list = -1;
|
||||
]],
|
||||
},
|
||||
method "add" {
|
||||
var_in{ "<any>", "sock" },
|
||||
var_in{ "short", "events" },
|
||||
var_out{ "int", "idx" },
|
||||
c_source "pre" [[
|
||||
zmq_pollitem_t *item;
|
||||
ZMQ_Socket *sock = NULL;
|
||||
socket_t fd = 0;
|
||||
]],
|
||||
c_source[[
|
||||
if(lua_isuserdata(L, ${sock::idx})) {
|
||||
sock = obj_type_ZMQ_Socket_check(L, ${sock::idx});
|
||||
} else if(lua_isnumber(L, ${sock::idx})) {
|
||||
fd = lua_tonumber(L, ${sock::idx});
|
||||
} else {
|
||||
return luaL_typerror(L, ${sock::idx}, "number or ZMQ_Socket");
|
||||
}
|
||||
${idx} = poller_get_free_item(${this});
|
||||
item = &(${this}->items[${idx}]);
|
||||
item->socket = sock;
|
||||
item->fd = fd;
|
||||
item->events = ${events};
|
||||
]],
|
||||
},
|
||||
method "modify" {
|
||||
var_in{ "<any>", "sock" },
|
||||
var_in{ "short", "events" },
|
||||
var_out{ "int", "idx" },
|
||||
c_source "pre" [[
|
||||
zmq_pollitem_t *item;
|
||||
ZMQ_Socket *sock = NULL;
|
||||
socket_t fd = 0;
|
||||
]],
|
||||
c_source[[
|
||||
if(lua_isuserdata(L, ${sock::idx})) {
|
||||
sock = obj_type_ZMQ_Socket_check(L, ${sock::idx});
|
||||
/* find sock in items list. */
|
||||
${idx} = poller_find_sock_item(${this}, sock);
|
||||
} else if(lua_isnumber(L, ${sock::idx})) {
|
||||
fd = lua_tonumber(L, ${sock::idx});
|
||||
/* find fd in items list. */
|
||||
${idx} = poller_find_fd_item(${this}, fd);
|
||||
} else {
|
||||
return luaL_typerror(L, ${sock::idx}, "number or ZMQ_Socket");
|
||||
}
|
||||
if(${events} != 0) {
|
||||
/* add/modify. */
|
||||
if(${idx} < 0) {
|
||||
${idx} = poller_get_free_item(${this});
|
||||
}
|
||||
item = &(${this}->items[${idx}]);
|
||||
item->socket = sock;
|
||||
item->fd = fd;
|
||||
item->events = ${events};
|
||||
} else if(${idx} >= 0) {
|
||||
/* no events remove socket/fd. */
|
||||
poller_remove_item(${this}, ${idx});
|
||||
}
|
||||
]],
|
||||
},
|
||||
method "remove" {
|
||||
var_in{ "<any>", "sock" },
|
||||
c_source "pre" [[
|
||||
ZMQ_Socket *sock;
|
||||
socket_t fd;
|
||||
int idx;
|
||||
]],
|
||||
c_source[[
|
||||
/* ZMQ_Socket or fd */
|
||||
if(lua_isuserdata(L, ${sock::idx})) {
|
||||
sock = obj_type_ZMQ_Socket_check(L, ${sock::idx});
|
||||
/* find sock in items list. */
|
||||
idx = poller_find_sock_item(${this}, sock);
|
||||
} else if(lua_isnumber(L, ${sock::idx})) {
|
||||
fd = lua_tonumber(L, ${sock::idx});
|
||||
/* find fd in items list. */
|
||||
idx = poller_find_fd_item(${this}, fd);
|
||||
} else {
|
||||
return luaL_typerror(L, ${sock::idx}, "number or ZMQ_Socket");
|
||||
}
|
||||
/* if sock/fd was found. */
|
||||
if(idx >= 0) {
|
||||
poller_remove_item(${this}, idx);
|
||||
}
|
||||
]],
|
||||
},
|
||||
method "poll" {
|
||||
var_in{ "long", "timeout" },
|
||||
var_out{ "ZMQ_Error", "err" },
|
||||
c_source[[
|
||||
/* poll for events */
|
||||
${err} = poller_poll(${this}, ${timeout});
|
||||
if(${err} > 0) {
|
||||
${this}->next = 0;
|
||||
} else {
|
||||
${this}->next = -1;
|
||||
}
|
||||
]],
|
||||
},
|
||||
method "next_revents" {
|
||||
var_out{ "<any>", "sock" },
|
||||
var_out{ "short", "revents" },
|
||||
c_source "pre" [[
|
||||
zmq_pollitem_t *items;
|
||||
int count;
|
||||
int idx;
|
||||
]],
|
||||
c_source[[
|
||||
${revents} = -1;
|
||||
idx = ${this}->next;
|
||||
if(idx >= 0) {
|
||||
count = ${this}->count;
|
||||
items = ${this}->items;
|
||||
/* find next item with pending events. */
|
||||
while(idx < count && items[idx].revents == 0) ++idx;
|
||||
/* did we find a pending event? */
|
||||
if(idx < count) {
|
||||
/* push the event's sock/fd. */
|
||||
if(items[idx].socket != NULL) {
|
||||
obj_type_ZMQ_Socket_push(L, items[idx].socket, 0);
|
||||
} else {
|
||||
lua_pushnumber(L, items[idx].fd);
|
||||
}
|
||||
${revents} = items[idx].revents;
|
||||
/* is this the last event. */
|
||||
++idx;
|
||||
${this}->next = (idx < count) ? idx : -1;
|
||||
}
|
||||
}
|
||||
if(${revents} < 0) {
|
||||
/* no more pending events. */
|
||||
lua_pushnil(L);
|
||||
${this}->next = -1;
|
||||
}
|
||||
]],
|
||||
},
|
||||
method "count" {
|
||||
var_out{ "int", "count" },
|
||||
c_source[[
|
||||
${count} = ${this}->count;
|
||||
]],
|
||||
ffi_source[[
|
||||
${count} = ${this}.count;
|
||||
]],
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue