prosody
06635b834e76%3A521976cb56e6
Software / code / prosody
Changeset
4949:521976cb56e6
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 08 Jul 2012 18:49:44 +0100 |
| parents | 4948:2c1de519f639 (diff) 4945:06635b834e76 (current diff) |
| children | 4951:e3ff2656cb37 |
| files | |
| diffstat | 2 files changed, 29 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_auth_anonymous.lua Sat Jul 07 02:43:57 2012 +0100 +++ b/plugins/mod_auth_anonymous.lua Sun Jul 08 18:49:44 2012 +0100 @@ -32,10 +32,9 @@ return nil, "Account creation/modification not supported."; end - function provider.get_sasl_handler(session) + function provider.get_sasl_handler() local anonymous_authentication_profile = { anonymous = function(sasl, username, realm) - session.roster = {}; -- so that the null storage backend doesn't upset rostermanager return true; -- for normal usage you should always return true here end };
--- a/util-src/pposix.c Sat Jul 07 02:43:57 2012 +0100 +++ b/util-src/pposix.c Sun Jul 08 18:49:44 2012 +0100 @@ -34,6 +34,11 @@ #include "lua.h" #include "lauxlib.h" +#if (defined(_SVID_SOURCE) && !defined(WITHOUT_MALLINFO)) + #include <malloc.h> + #define WITH_MALLINFO +#endif + /* Daemonization support */ static int lc_daemonize(lua_State *L) @@ -612,6 +617,25 @@ return 1; } +#ifdef WITH_MALLINFO +int lc_meminfo(lua_State* L) +{ + struct mallinfo info = mallinfo(); + lua_newtable(L); + lua_pushinteger(L, info.arena); + lua_setfield(L, -2, "allocated"); + lua_pushinteger(L, info.hblkhd); + lua_setfield(L, -2, "allocated_mmap"); + lua_pushinteger(L, info.uordblks); + lua_setfield(L, -2, "used"); + lua_pushinteger(L, info.fordblks); + lua_setfield(L, -2, "unused"); + lua_pushinteger(L, info.keepcost); + lua_setfield(L, -2, "returnable"); + return 1; +} +#endif + /* Register functions */ int luaopen_util_pposix(lua_State *L) @@ -645,6 +669,10 @@ { "setenv", lc_setenv }, +#ifdef WITH_MALLINFO + { "meminfo", lc_meminfo }, +#endif + { NULL, NULL } };
