From patchwork Thu May 19 11:01:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Fraser X-Patchwork-Id: 623935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r9SqB1PJdz9t3v for ; Thu, 19 May 2016 21:03:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netduma-com.20150623.gappssmtp.com header.i=@netduma-com.20150623.gappssmtp.com header.b=Kj6d80lo; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3Li9-00029d-U4; Thu, 19 May 2016 11:01:49 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3Li7-00023J-Bg for lede-dev@lists.infradead.org; Thu, 19 May 2016 11:01:48 +0000 Received: by mail-wm0-x230.google.com with SMTP id n129so29819363wmn.1 for ; Thu, 19 May 2016 04:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netduma-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=klWEDo2pQlapAfJyRtOww2WXmw0F8z9QNAe/iG0gjfI=; b=Kj6d80lo+3yDZdC5kch9iKKVTC8D9mu2pYxUtWq8qnIBvFPDj4BYhJjPhl9Wa7h/vL wGKLAt0UtVsWADD/PyK46a2b2gt1hFQSlAsnZ0z1eqDIxIizu9RqcArOtJHLTKoKXmHl AYyMxNBHFh6f01Je21rv4IaaqJvaNlxQVY55eisKL3wEPoymOqdTe6hmTGKfXOf4Sdi3 LNuqFcO56Ue/NlrQlkSx28xcJ+KVSte4xWZLrjdaz7mA/EyqaP/963A67/aTbNwS6mYx BLT96o3R9xQxCCc+Li2eIft8vivVlA9+YFO6J5i0Hsa8SYGYkLl9zdHh+7SALUVihfSH bGyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=klWEDo2pQlapAfJyRtOww2WXmw0F8z9QNAe/iG0gjfI=; b=i3yfmXOEPu9dz4TBtzIfTBtspHAY/z+sifj+Zlj5c5IBkrEVgMtQH3v/NVOX8XZudo UzJNHpcPqT5aG83a3jTJY0SXJCuoiJR3sjzD8BZxjJIG+pv5CGlwQjl1Lov29ss+1Kd9 0lKWj7NXJcXncZm/h6rmcc58ljmmltaoP8wyEX0TWQOkasJgiExL3LBH/ZpQ1qYUCPAe BC1cMr/hXXbGWk6d7aDz1HXykmirX7xOwQrJh2Nf1nVAxdn6CEcXuQJMPzRCFARVmspv u0bIp/5FZFqmgh8T9k0al5jt54l/jtYq2xJ8xODlJGbaz7Q9NIs3bFkpD9w1Ra2+uqbK gYSQ== X-Gm-Message-State: AOPr4FUYKElZ6ZElCQjIeKpligV15789Qjs9JqseoXqUc1e/PdNtAcAI1InpuwzvMvyjSw== X-Received: by 10.28.6.17 with SMTP id 17mr13541571wmg.26.1463655684577; Thu, 19 May 2016 04:01:24 -0700 (PDT) Received: from iain-dev-laptop.lan ([31.24.219.131]) by smtp.gmail.com with ESMTPSA id n66sm14230375wmn.7.2016.05.19.04.01.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:01:23 -0700 (PDT) From: Iain Fraser To: lede-dev@lists.infradead.org Date: Thu, 19 May 2016 12:01:19 +0100 Message-Id: <1463655679-14663-1-git-send-email-iainf@netduma.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160519_040147_731777_FE19F79A X-CRM114-Status: GOOD ( 19.62 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:230 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] Added publish/subscribe lua bindings with examples. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Iain Fraser MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Iain Fraser --- lua/ubus.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 1 deletion(-) diff --git a/lua/ubus.c b/lua/ubus.c index 86e34b7..9941ef6 100644 --- a/lua/ubus.c +++ b/lua/ubus.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Jo-Philipp Wich * Copyright (C) 2012 John Crispin + * Copyright (C) 2016 Iain Fraser * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 2.1 @@ -33,6 +34,7 @@ struct ubus_lua_connection { struct ubus_lua_object { struct ubus_object o; int r; + int rsubscriber; }; struct ubus_lua_event { @@ -40,6 +42,12 @@ struct ubus_lua_event { int r; }; +struct ubus_lua_subscriber { + struct ubus_subscriber s; + int rnotify; + int rremove; +}; + static int ubus_lua_parse_blob(lua_State *L, struct blob_attr *attr, bool table); @@ -412,6 +420,39 @@ static int ubus_lua_load_methods(lua_State *L, struct ubus_method *m) return 0; } +static void +ubus_new_sub_cb(struct ubus_context *ctx, struct ubus_object *obj){ + struct ubus_lua_object *luobj; + + luobj = container_of(obj, struct ubus_lua_object, o); + + lua_getglobal(state, "__ubus_cb_publisher"); + lua_rawgeti(state, -1, luobj->rsubscriber); + lua_remove(state, -2); + + if (lua_isfunction(state, -1)) { + lua_pushnumber(state, luobj->o.has_subscribers ); + lua_call(state, 1, 0); + } else { + lua_pop(state, 1); + } + + return; +} + +static void +ubus_lua_load_newsub_cb( lua_State *L, struct ubus_lua_object *obj ){ + /* keep ref to func */ + lua_getglobal(L, "__ubus_cb_publisher"); + lua_pushvalue(L, -2); + obj->rsubscriber = luaL_ref(L, -2); + lua_pop(L, 1); + + /* real callback */ + obj->o.subscribe_cb = ubus_new_sub_cb; + return; +} + static struct ubus_object* ubus_lua_load_object(lua_State *L) { struct ubus_lua_object *obj = NULL; @@ -454,6 +495,13 @@ static struct ubus_object* ubus_lua_load_object(lua_State *L) /* scan each method */ lua_pushnil(L); while (lua_next(L, -3) != 0) { + /* check if its the subscriber notification callback */ + if( lua_type( L, -2 ) == LUA_TSTRING && + lua_type( L, -1 ) == LUA_TFUNCTION ){ + if( !strcmp( lua_tostring( L, -2 ), "__subscriber_cb" ) ) + ubus_lua_load_newsub_cb( L, obj ); + } + /* check if it looks like a method */ if ((lua_type(L, -2) != LUA_TSTRING) || (lua_type(L, -1) != LUA_TTABLE) || @@ -495,8 +543,14 @@ static int ubus_lua_add(lua_State *L) if ((lua_type(L, -2) == LUA_TSTRING) && (lua_type(L, -1) == LUA_TTABLE)) { obj = ubus_lua_load_object(L); - if (obj) + if (obj){ ubus_add_object(c->ctx, obj); + + /* allow future reference of ubus obj */ + lua_pushstring(state,"__ubusobj"); + lua_pushlightuserdata(state, obj); + lua_settable(state,-3); + } } lua_pop(L, 1); } @@ -504,6 +558,33 @@ static int ubus_lua_add(lua_State *L) return 0; } +static int +ubus_lua_notify( lua_State *L ){ + struct ubus_lua_connection *c; + struct ubus_object *obj; + const char* method; + + c = luaL_checkudata(L, 1, METANAME); + method = luaL_checkstring(L, 3); + luaL_checktype(L, 4, LUA_TTABLE); + + if( !lua_islightuserdata( L, 2 ) ){ + lua_pushfstring( L, "Invald 2nd parameter, expected ubus obj ref" ); + lua_error( L ); + } + obj = lua_touserdata( L, 2 ); + + /* create parameters from table */ + blob_buf_init(&c->buf, 0); + if( !ubus_lua_format_blob_array( L, &c->buf, true ) ){ + lua_pushfstring( L, "Invalid 4th parameter, expected table of arguments" ); + lua_error( L ); + } + + ubus_notify( c->ctx, obj, method, c->buf.head, -1 ); + return 0; +} + static void ubus_lua_signatures_cb(struct ubus_context *c, struct ubus_object_data *o, void *p) { @@ -653,6 +734,147 @@ ubus_lua_listen(lua_State *L) { return 0; } +static void +ubus_sub_remove_handler(struct ubus_context *ctx, struct ubus_subscriber *s, + uint32_t id) { + struct ubus_lua_subscriber *sub; + + sub = container_of(s, struct ubus_lua_subscriber, s); + + lua_getglobal(state, "__ubus_cb_subscribe"); + lua_rawgeti(state, -1, sub->rremove); + lua_remove(state, -2); + + if (lua_isfunction(state, -1)) { + lua_call(state, 0, 0); + } else { + lua_pop(state, 1); + } + + return; +} + +static int +ubus_sub_notify_handler(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg){ + + struct ubus_subscriber *s; + struct ubus_lua_subscriber *sub; + + s = container_of(obj, struct ubus_subscriber, obj); + sub = container_of(s, struct ubus_lua_subscriber, s); + + lua_getglobal(state, "__ubus_cb_subscribe"); + lua_rawgeti(state, -1, sub->rnotify); + lua_remove(state, -2); + + if (lua_isfunction(state, -1)) { + if( msg ){ + ubus_lua_parse_blob_array(state, blob_data(msg), blob_len(msg), true); + lua_call(state, 1, 0); + } else { + lua_call(state, 0, 0); + } + } else { + lua_pop(state, 1); + } + + return 0; +} + + + +static void +ubus_lua_do_subscribe( struct ubus_context *ctx, lua_State *L, const char* target, + int idxnotify, int idxremove ){ + uint32_t id; + int status; + struct ubus_lua_subscriber *sub; + + if( ( status = ubus_lookup_id( ctx, target, &id ) ) ){ + lua_pushfstring( L, "Unable find target, status=%d", status ); + lua_error( L ); + } + + sub = malloc( sizeof( struct ubus_lua_subscriber ) ); + memset( sub, 0, sizeof( struct ubus_lua_subscriber ) ); + if( !sub ){ + lua_pushstring( L, "Out of memory" ); + lua_error( L ); + } + + if( idxnotify ){ + /* update the he callback lookup table */ + lua_getglobal(L, "__ubus_cb_subscribe"); + lua_pushvalue(L, idxnotify); + sub->rnotify = luaL_ref(L, -2); + lua_pop(L, 1); + sub->s.cb = ubus_sub_notify_handler; + + } + + if( idxremove ){ + lua_getglobal(L, "__ubus_cb_subscribe"); + lua_pushvalue(L, idxnotify); + sub->rnotify = luaL_ref(L, -2); + lua_pop(L, 1); + sub->s.remove_cb = ubus_sub_remove_handler; + } + + if( ( status = ubus_register_subscriber( ctx, &sub->s ) ) ){ + lua_pushfstring( L, "Failed to register subscriber, status=%d", status ); + lua_error( L ); + } + + if( ( status = ubus_subscribe( ctx, &sub->s, id) ) ){ + lua_pushfstring( L, "Failed to register subscriber, status=%d", status ); + lua_error( L ); + } + + return; +} + +static int +ubus_lua_subscribe(lua_State *L) { + int idxnotify, idxremove, stackstart; + struct ubus_lua_connection *c; + const char* target; + + idxnotify = idxremove = 0; + stackstart = lua_gettop( L ); + + + c = luaL_checkudata(L, 1, METANAME); + target = luaL_checkstring(L, 2); + luaL_checktype(L, 3, LUA_TTABLE); + + + lua_pushstring( L, "notify"); + lua_gettable( L, 3 ); + if( lua_type( L, -1 ) == LUA_TFUNCTION ){ + idxnotify = lua_gettop( L ); + } else { + lua_pop( L, 1 ); + } + + lua_pushstring( L, "remove"); + lua_gettable( L, 3 ); + if( lua_type( L, -1 ) == LUA_TFUNCTION ){ + idxremove = lua_gettop( L ); + } else { + lua_pop( L, 1 ); + } + + if( idxnotify ) + ubus_lua_do_subscribe( c->ctx, L, target, idxnotify, idxremove ); + + if( lua_gettop( L ) > stackstart ) + lua_pop( L, lua_gettop( L ) - stackstart ); + + return 0; +} + static int ubus_lua_send(lua_State *L) { @@ -699,12 +921,14 @@ static const luaL_Reg ubus[] = { { "connect", ubus_lua_connect }, { "objects", ubus_lua_objects }, { "add", ubus_lua_add }, + { "notify", ubus_lua_notify }, { "reply", ubus_lua_reply }, { "signatures", ubus_lua_signatures }, { "call", ubus_lua_call }, { "close", ubus_lua__gc }, { "listen", ubus_lua_listen }, { "send", ubus_lua_send }, + { "subscribe", ubus_lua_subscribe }, { "__gc", ubus_lua__gc }, { NULL, NULL }, }; @@ -758,5 +982,12 @@ luaopen_ubus(lua_State *L) lua_createtable(L, 1, 0); lua_setglobal(L, "__ubus_cb_event"); + /* create the subscriber table */ + lua_createtable(L, 1, 0); + lua_setglobal(L, "__ubus_cb_subscribe"); + + /* create the publisher table - notifications of new subs */ + lua_createtable(L, 1, 0); + lua_setglobal(L, "__ubus_cb_publisher"); return 0; }