resource: add resource.method.recalc(zone_name) function

diff --git a/src/resource/config-lua.c b/src/resource/config-lua.c
index ce83b41..42d7bc8 100644 (file)
--- a/src/resource/config-lua.c
+++ b/src/resource/config-lua.c
@@ -49,6 +49,7 @@
 #include "application-class.h"
 #include "resource.h"
 #include "resource-set.h"
+#include "resource-owner.h"
 #include "attribute.h"
 
 #define ZONE_CLASS             MRP_LUA_CLASS_SIMPLE(zone)
@@ -85,6 +86,7 @@ enum field_e {
     SHARED,
     METHOD,
     OWNERS,
+    RECALC,
     VETO,
     ID
 };
@@ -204,6 +206,8 @@ static int push_order(lua_State *, mrp_resource_order_t);
 static field_t field_check(lua_State *, int, const char **);
 static field_t field_name_to_type(const char *, size_t);
 
+static int method_recalc(lua_State *);
+
 
 MRP_LUA_METHOD_LIST_TABLE (
     zone_attr_methods,       /* methodlist name */
@@ -467,8 +471,26 @@ static void resource_class_create(lua_State *L)
 
 static void resource_methods_create(lua_State *L)
 {
+    typedef struct {
+        const char *name;
+        lua_CFunction func;
+    } method_def_t;
+
+    static method_def_t method_defs[] = {
+        { "recalc",  method_recalc },
+        {   NULL  ,      NULL      }
+    };
+
+    method_def_t *md;
+
     mrp_lua_create_object_class(L, RESMETHOD_CLASS);
     resource_methods = resmethod_create_from_c(L);
+
+    for (md = method_defs;  md->name;   md++) {
+        lua_pushstring(L, md->name);
+        lua_pushcfunction(L, md->func);
+        lua_rawset(L, -3);
+    }
 }
 
 
@@ -1268,6 +1290,7 @@ static int resmethod_getfield(lua_State *L)
         else {
             switch (fld) {
             case VETO:
+            case RECALC:
                 lua_pushstring(L, name);
                 lua_rawget(L, 1);
                 break;
@@ -1656,6 +1679,8 @@ static field_t field_name_to_type(const char *name, size_t len)
             return OWNERS;
         if (!strcmp(name, "shared"))
             return SHARED;
+        if (!strcmp(name, "recalc"))
+            return RECALC;
         break;
 
     case 8:
@@ -1682,6 +1707,24 @@ static field_t field_name_to_type(const char *name, size_t len)
     return 0;
 }
 
+static int method_recalc(lua_State *L)
+{
+    const char *zone_name;
+    mrp_zone_t *zone;
+
+    if (lua_type(L, 1) == LUA_TSTRING && (zone_name = lua_tostring(L, 1))) {
+
+        if (!(zone = mrp_zone_find_by_name(zone_name))) {
+            luaL_error(L, "can't recalculate resources in zone '%s': "
+                       "no such zone", zone_name);
+        }
+
+        mrp_resource_owner_update_zone(zone->id, NULL, 0);
+    }
+
+    return 0;
+}
+
 /*
  * Local Variables:
  * c-basic-offset: 4

diff --git a/src/resource/resource-owner.c b/src/resource/resource-owner.c
index b89e66e..8a22306 100644 (file)
--- a/src/resource/resource-owner.c
+++ b/src/resource/resource-owner.c
@@ -195,7 +195,9 @@ void mrp_resource_owner_update_zone(uint32_t zoneid,
 
     MRP_ASSERT(zone, "zone is not defined");
 
-    maxev  = mrp_get_resource_set_count();
+    if (!(maxev = mrp_get_resource_set_count()))
+        return;
+
     nevent = 0;
     events = mrp_alloc(sizeof(event_t) * maxev);