From 144b71f72009cd45c5c968acd9872f82f9912c05 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 1 Dec 2009 20:29:02 +0000
Subject: [PATCH] fixed white space for lua
---
auxdir/x_ac_lua.m4 | 26 +-
configure | 16 +-
configure.ac | 2 +-
src/common/plugrack.c | 6 +-
src/plugins/proctrack/lua/proctrack_lua.c | 602 +++++++++++-----------
5 files changed, 326 insertions(+), 326 deletions(-)
diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
index 54abdd830c8..2e9ca2bfe2c 100644
--- a/auxdir/x_ac_lua.m4
+++ b/auxdir/x_ac_lua.m4
@@ -14,18 +14,18 @@
AC_DEFUN([X_AC_LUA],
[
- x_ac_lua_pkg_name="lua"
- PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1], [])
- PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
+ x_ac_lua_pkg_name="lua"
+ PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1], [])
+ PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
+ [x_ac_have_lua="yes"],
+ [x_ac_have_lua="no"])
+
+ if test "x$x_ac_have_lua" = "xyes"; then
+ x_ac_lua_saved_LIBS="$LIBS"
+ AC_SEARCH_LIBS([luaL_newstate], [lua lua5.1],
[x_ac_have_lua="yes"],
- [x_ac_have_lua="no"])
-
- if test "x$x_ac_have_lua" = "xyes"; then
- x_ac_lua_saved_LIBS="$LIBS"
- AC_SEARCH_LIBS([luaL_newstate], [lua lua5.1],
- [x_ac_have_lua="yes"],
- [x_ac_have_lua="no"])
- LIBS="$x_ac_lua_saved_LIBS"
- fi
- AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
+ [x_ac_have_lua="no"])
+ LIBS="$x_ac_lua_saved_LIBS"
+ fi
+ AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
])
diff --git a/configure b/configure
index 2d24ae3b17c..49496b6b717 100755
--- a/configure
+++ b/configure
@@ -19462,8 +19462,8 @@ fi
- x_ac_lua_pkg_name="lua"
- if test -n "$PKG_CONFIG" && \
+ x_ac_lua_pkg_name="lua"
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
ac_status=$?
@@ -19543,9 +19543,9 @@ $as_echo "yes" >&6; }
x_ac_have_lua="yes"
fi
- if test "x$x_ac_have_lua" = "xyes"; then
- x_ac_lua_saved_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing luaL_newstate" >&5
+ if test "x$x_ac_have_lua" = "xyes"; then
+ x_ac_lua_saved_LIBS="$LIBS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing luaL_newstate" >&5
$as_echo_n "checking for library containing luaL_newstate... " >&6; }
if test "${ac_cv_search_luaL_newstate+set}" = set; then :
$as_echo_n "(cached) " >&6
@@ -19603,9 +19603,9 @@ else
x_ac_have_lua="no"
fi
- LIBS="$x_ac_lua_saved_LIBS"
- fi
- if test "x$x_ac_have_lua" = "xyes"; then
+ LIBS="$x_ac_lua_saved_LIBS"
+ fi
+ if test "x$x_ac_have_lua" = "xyes"; then
HAVE_LUA_TRUE=
HAVE_LUA_FALSE='#'
else
diff --git a/configure.ac b/configure.ac
index 7700b04a696..92e6af6b43d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -392,7 +392,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/proctrack/linuxproc/Makefile
src/plugins/proctrack/rms/Makefile
src/plugins/proctrack/sgi_job/Makefile
- src/plugins/proctrack/lua/Makefile
+ src/plugins/proctrack/lua/Makefile
src/plugins/sched/Makefile
src/plugins/sched/backfill/Makefile
src/plugins/sched/builtin/Makefile
diff --git a/src/common/plugrack.c b/src/common/plugrack.c
index 302fe5753e5..9df07b15580 100644
--- a/src/common/plugrack.c
+++ b/src/common/plugrack.c
@@ -416,8 +416,8 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
/* Check only regular files. */
if ( (strncmp(e->d_name, ".", 1) == 0)
- || (stat( fq_path, &st ) < 0)
- || (! S_ISREG(st.st_mode)) )
+ || (stat( fq_path, &st ) < 0)
+ || (! S_ISREG(st.st_mode)) )
continue;
/* Check only shared object files */
@@ -580,7 +580,7 @@ plugrack_use_by_type( plugrack_t rack,
it = list_iterator_create(rack->entries);
while ((e = list_next(it))) {
- plugin_err_t err;
+ plugin_err_t err;
if (strcmp(full_type, e->full_type) != 0)
continue;
diff --git a/src/plugins/proctrack/lua/proctrack_lua.c b/src/plugins/proctrack/lua/proctrack_lua.c
index 63f3b4d44cd..00d1dad4138 100644
--- a/src/plugins/proctrack/lua/proctrack_lua.c
+++ b/src/plugins/proctrack/lua/proctrack_lua.c
@@ -76,65 +76,65 @@ static lua_State *L = NULL;
*/
static int l_log_msg (lua_State *L)
{
- const char *prefix = "proctrack.lua";
- int level = 0;
- const char *msg;
-
- /*
- * Optional numeric prefix indicating the log level
- * of the message.
- */
-
- /*
- * Pop message off the lua stack
- */
- msg = lua_tostring (L, -1);
- lua_pop (L, 1);
- /*
- * Pop level off stack:
- */
- level = (int) lua_tonumber (L, -1);
- lua_pop (L, 1);
-
- /*
- * Call appropriate slurm log function based on log-level argument
- */
- if (level > 3)
- debug3 ("%s: %s", prefix, msg);
- else if (level == 3)
- debug2 ("%s: %s", prefix, msg);
- else if (level == 2)
- debug ("%s: %s", prefix, msg);
- else if (level == 1)
- verbose ("%s: %s", prefix, msg);
- else if (level == 0)
- info ("%s: %s", prefix, msg);
- return (0);
+ const char *prefix = "proctrack.lua";
+ int level = 0;
+ const char *msg;
+
+ /*
+ * Optional numeric prefix indicating the log level
+ * of the message.
+ */
+
+ /*
+ * Pop message off the lua stack
+ */
+ msg = lua_tostring (L, -1);
+ lua_pop (L, 1);
+ /*
+ * Pop level off stack:
+ */
+ level = (int) lua_tonumber (L, -1);
+ lua_pop (L, 1);
+
+ /*
+ * Call appropriate slurm log function based on log-level argument
+ */
+ if (level > 3)
+ debug3 ("%s: %s", prefix, msg);
+ else if (level == 3)
+ debug2 ("%s: %s", prefix, msg);
+ else if (level == 2)
+ debug ("%s: %s", prefix, msg);
+ else if (level == 1)
+ verbose ("%s: %s", prefix, msg);
+ else if (level == 0)
+ info ("%s: %s", prefix, msg);
+ return (0);
}
static int l_log_error (lua_State *L)
{
- const char *prefix = "proctrack.lua";
- const char *msg = lua_tostring (L, -1);
- error ("%s: %s", prefix, msg);
- return (0);
+ const char *prefix = "proctrack.lua";
+ const char *msg = lua_tostring (L, -1);
+ error ("%s: %s", prefix, msg);
+ return (0);
}
static const struct luaL_Reg slurm_functions [] = {
- { "log", l_log_msg },
- { "error", l_log_error },
- { NULL, NULL }
+ { "log", l_log_msg },
+ { "error", l_log_error },
+ { NULL, NULL }
};
static int lua_register_slurm_output_functions ()
{
- /*
- * Register slurm output functions in a global "slurm" table
- */
- lua_newtable (L);
- luaL_register (L, NULL, slurm_functions);
- lua_setglobal (L, "slurm");
- return 0;
+ /*
+ * Register slurm output functions in a global "slurm" table
+ */
+ lua_newtable (L);
+ luaL_register (L, NULL, slurm_functions);
+ lua_setglobal (L, "slurm");
+ return 0;
}
/*
@@ -142,12 +142,12 @@ static int lua_register_slurm_output_functions ()
*/
static int check_lua_script_function (const char *name)
{
- int rc = 0;
- lua_getglobal (L, name);
- if (!lua_isfunction (L, -1))
- rc = -1;
- lua_pop (L, -1);
- return (rc);
+ int rc = 0;
+ lua_getglobal (L, name);
+ if (!lua_isfunction (L, -1))
+ rc = -1;
+ lua_pop (L, -1);
+ return (rc);
}
/*
@@ -155,81 +155,81 @@ static int check_lua_script_function (const char *name)
*/
static int check_lua_script_functions ()
{
- int rc = 0;
- int i;
- const char *fns[] = {
- "slurm_container_create",
- "slurm_container_add",
- "slurm_container_signal",
- "slurm_container_destroy",
- "slurm_container_find",
- "slurm_container_has_pid",
- "slurm_container_wait",
- "slurm_container_get_pids",
- NULL
- };
-
- i = 0;
- do {
- if (check_lua_script_function (fns[i]) < 0) {
- error ("proctrack/lua: %s: missing required function %s",
- lua_script_path, fns[i]);
- rc = -1;
- }
- } while (fns[++i]);
-
- return (rc);
+ int rc = 0;
+ int i;
+ const char *fns[] = {
+ "slurm_container_create",
+ "slurm_container_add",
+ "slurm_container_signal",
+ "slurm_container_destroy",
+ "slurm_container_find",
+ "slurm_container_has_pid",
+ "slurm_container_wait",
+ "slurm_container_get_pids",
+ NULL
+ };
+
+ i = 0;
+ do {
+ if (check_lua_script_function (fns[i]) < 0) {
+ error ("proctrack/lua: %s: missing required function %s",
+ lua_script_path, fns[i]);
+ rc = -1;
+ }
+ } while (fns[++i]);
+
+ return (rc);
}
int init (void)
{
- int rc = SLURM_SUCCESS;
-
- /*
- * Need to dlopen() liblua.so with RTLD_GLOBAL in order to
- * ensure symbols from liblua are available to libs opened
- * by any lua scripts.
- */
- if (!dlopen ("liblua.so", RTLD_NOW | RTLD_GLOBAL)) {
- return (error ("Failed to open liblua.so: %s", dlerror()));
- }
-
- /*
- * Initilize lua
- */
- L = luaL_newstate ();
- luaL_openlibs (L);
- if (luaL_loadfile (L, lua_script_path))
- return error ("lua: %s: %s", lua_script_path, lua_tostring (L, -1));
-
- /*
- * Register slurm.log and slurm.error functions in lua state:
- */
- lua_register_slurm_output_functions ();
-
- /*
- * Run the user script:
- */
- if (lua_pcall (L, 0, 1, 0) != 0)
- return error ("proctrack/lua: %s: %s",
- lua_script_path, lua_tostring (L, -1));
-
- /*
- * Get any return code from the lua script
- */
- rc = (int) lua_tonumber (L, -1);
- lua_pop (L, 1);
-
- /*
- * Check for required lua script functions:
- */
- return (check_lua_script_functions ());
+ int rc = SLURM_SUCCESS;
+
+ /*
+ * Need to dlopen() liblua.so with RTLD_GLOBAL in order to
+ * ensure symbols from liblua are available to libs opened
+ * by any lua scripts.
+ */
+ if (!dlopen ("liblua.so", RTLD_NOW | RTLD_GLOBAL)) {
+ return (error ("Failed to open liblua.so: %s", dlerror()));
+ }
+
+ /*
+ * Initilize lua
+ */
+ L = luaL_newstate ();
+ luaL_openlibs (L);
+ if (luaL_loadfile (L, lua_script_path))
+ return error ("lua: %s: %s", lua_script_path, lua_tostring (L, -1));
+
+ /*
+ * Register slurm.log and slurm.error functions in lua state:
+ */
+ lua_register_slurm_output_functions ();
+
+ /*
+ * Run the user script:
+ */
+ if (lua_pcall (L, 0, 1, 0) != 0)
+ return error ("proctrack/lua: %s: %s",
+ lua_script_path, lua_tostring (L, -1));
+
+ /*
+ * Get any return code from the lua script
+ */
+ rc = (int) lua_tonumber (L, -1);
+ lua_pop (L, 1);
+
+ /*
+ * Check for required lua script functions:
+ */
+ return (check_lua_script_functions ());
}
int fini (void)
{
- lua_close (L);
- return SLURM_SUCCESS;
+ lua_close (L);
+ return SLURM_SUCCESS;
}
@@ -238,236 +238,236 @@ int fini (void)
*/
static int lua_job_table_create (slurmd_job_t *job)
{
- lua_newtable (L);
-
- lua_pushnumber (L, job->jobid);
- lua_setfield (L, -2, "jobid");
- lua_pushnumber (L, job->stepid);
- lua_setfield (L, -2, "stepid");
- lua_pushnumber (L, job->nodeid);
- lua_setfield (L, -2, "nodeid");
- lua_pushnumber (L, job->ntasks);
- lua_setfield (L, -2, "ntasks");
- lua_pushnumber (L, job->nprocs);
- lua_setfield (L, -2, "nprocs");
- lua_pushnumber (L, job->cpus_per_task);
- lua_setfield (L, -2, "cpus_per_task");
- lua_pushnumber (L, job->nnodes);
- lua_setfield (L, -2, "nnodes");
- lua_pushnumber (L, job->uid);
- lua_setfield (L, -2, "uid");
- lua_pushnumber (L, job->gid);
- lua_setfield (L, -2, "gid");
- lua_pushnumber (L, job->pgid);
- lua_setfield (L, -2, "pgid");
- lua_pushnumber (L, job->jmgr_pid);
- lua_setfield (L, -2, "jmgr_pid");
- lua_pushnumber (L, job->job_mem);
- lua_setfield (L, -2, "mem");
-
- lua_pushstring (L, job->alloc_cores ? job->alloc_cores : "");
- lua_setfield (L, -2, "CPUs");
- lua_pushstring (L, job->cwd ? job->cwd : "");
- lua_setfield (L, -2, "cwd");
-
- return (0);
+ lua_newtable (L);
+
+ lua_pushnumber (L, job->jobid);
+ lua_setfield (L, -2, "jobid");
+ lua_pushnumber (L, job->stepid);
+ lua_setfield (L, -2, "stepid");
+ lua_pushnumber (L, job->nodeid);
+ lua_setfield (L, -2, "nodeid");
+ lua_pushnumber (L, job->ntasks);
+ lua_setfield (L, -2, "ntasks");
+ lua_pushnumber (L, job->nprocs);
+ lua_setfield (L, -2, "nprocs");
+ lua_pushnumber (L, job->cpus_per_task);
+ lua_setfield (L, -2, "cpus_per_task");
+ lua_pushnumber (L, job->nnodes);
+ lua_setfield (L, -2, "nnodes");
+ lua_pushnumber (L, job->uid);
+ lua_setfield (L, -2, "uid");
+ lua_pushnumber (L, job->gid);
+ lua_setfield (L, -2, "gid");
+ lua_pushnumber (L, job->pgid);
+ lua_setfield (L, -2, "pgid");
+ lua_pushnumber (L, job->jmgr_pid);
+ lua_setfield (L, -2, "jmgr_pid");
+ lua_pushnumber (L, job->job_mem);
+ lua_setfield (L, -2, "mem");
+
+ lua_pushstring (L, job->alloc_cores ? job->alloc_cores : "");
+ lua_setfield (L, -2, "CPUs");
+ lua_pushstring (L, job->cwd ? job->cwd : "");
+ lua_setfield (L, -2, "cwd");
+
+ return (0);
}
int slurm_container_create (slurmd_job_t *job)
{
- double id;
- /*
- * All lua script functions should have been verified during
- * initialization:
- */
- lua_getglobal (L, "slurm_container_create");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
-
- lua_job_table_create (job);
- if (lua_pcall (L, 1, 1, 0) != 0)
- return error ("proctrack/lua: %s: slurm_container_create: %s",
- lua_script_path, lua_tostring (L, -1));
-
- /*
- * Get the container id off the stack:
- */
- if (lua_isnil (L, -1)) {
- lua_pop (L, -1);
- return (-1);
- }
- id = lua_tonumber (L, -1);
- job->cont_id = id;
- info ("job->cont_id = %u (%.0f) \n", job->cont_id, id);
- lua_pop (L, -1);
- return (0);
+ double id;
+ /*
+ * All lua script functions should have been verified during
+ * initialization:
+ */
+ lua_getglobal (L, "slurm_container_create");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
+
+ lua_job_table_create (job);
+ if (lua_pcall (L, 1, 1, 0) != 0)
+ return error ("proctrack/lua: %s: slurm_container_create: %s",
+ lua_script_path, lua_tostring (L, -1));
+
+ /*
+ * Get the container id off the stack:
+ */
+ if (lua_isnil (L, -1)) {
+ lua_pop (L, -1);
+ return (-1);
+ }
+ id = lua_tonumber (L, -1);
+ job->cont_id = id;
+ info ("job->cont_id = %u (%.0f) \n", job->cont_id, id);
+ lua_pop (L, -1);
+ return (0);
}
int slurm_container_add (slurmd_job_t *job, pid_t pid)
{
- int rc;
+ int rc;
- lua_getglobal (L, "slurm_container_add");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ lua_getglobal (L, "slurm_container_add");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_job_table_create (job);
- lua_pushnumber (L, job->cont_id);
- lua_pushnumber (L, pid);
+ lua_job_table_create (job);
+ lua_pushnumber (L, job->cont_id);
+ lua_pushnumber (L, pid);
- if (lua_pcall (L, 3, 1, 0) != 0)
- return error ("running lua function 'slurm_container_add': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 3, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_add': %s",
+ lua_tostring (L, -1));
- rc = lua_tonumber (L, -1);
- lua_pop (L, -1);
- return (rc);
+ rc = lua_tonumber (L, -1);
+ lua_pop (L, -1);
+ return (rc);
}
int slurm_container_signal (uint32_t id, int sig)
{
- int rc;
- lua_getglobal (L, "slurm_container_signal");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ int rc;
+ lua_getglobal (L, "slurm_container_signal");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_pushnumber (L, id);
- lua_pushnumber (L, sig);
+ lua_pushnumber (L, id);
+ lua_pushnumber (L, sig);
- if (lua_pcall (L, 2, 1, 0) != 0)
- return error ("running lua function 'slurm_container_signal': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 2, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_signal': %s",
+ lua_tostring (L, -1));
- rc = lua_tonumber (L, -1);
- lua_pop (L, -1);
- return (rc);
+ rc = lua_tonumber (L, -1);
+ lua_pop (L, -1);
+ return (rc);
}
int slurm_container_destroy (uint32_t id)
{
- int rc;
- lua_getglobal (L, "slurm_container_destroy");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ int rc;
+ lua_getglobal (L, "slurm_container_destroy");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_pushnumber (L, id);
+ lua_pushnumber (L, id);
- if (lua_pcall (L, 1, 1, 0) != 0)
- return error ("running lua function 'slurm_container_destroy': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 1, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_destroy': %s",
+ lua_tostring (L, -1));
- rc = lua_tonumber (L, -1);
- lua_pop (L, -1);
- return (rc);
+ rc = lua_tonumber (L, -1);
+ lua_pop (L, -1);
+ return (rc);
}
uint32_t slurm_container_find (pid_t pid)
{
- uint32_t id;
- lua_getglobal (L, "slurm_container_find");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ uint32_t id;
+ lua_getglobal (L, "slurm_container_find");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_pushnumber (L, pid);
+ lua_pushnumber (L, pid);
- if (lua_pcall (L, 1, 1, 0) != 0)
- return error ("running lua function 'slurm_container_find': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 1, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_find': %s",
+ lua_tostring (L, -1));
- id = (uint32_t) lua_tonumber (L, -1);
- lua_pop (L, -1);
- return (id);
+ id = (uint32_t) lua_tonumber (L, -1);
+ lua_pop (L, -1);
+ return (id);
}
bool slurm_container_has_pid (uint32_t id, pid_t pid)
{
- int rc;
- lua_getglobal (L, "slurm_container_has_pid");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ int rc;
+ lua_getglobal (L, "slurm_container_has_pid");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_pushnumber (L, id);
- lua_pushnumber (L, pid);
+ lua_pushnumber (L, id);
+ lua_pushnumber (L, pid);
- if (lua_pcall (L, 2, 1, 0) != 0)
- return error ("running lua function 'slurm_container_has_pid': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 2, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_has_pid': %s",
+ lua_tostring (L, -1));
- rc = lua_toboolean (L, -1);
- lua_pop (L, -1);
- return (rc == 1);
+ rc = lua_toboolean (L, -1);
+ lua_pop (L, -1);
+ return (rc == 1);
}
int slurm_container_wait (uint32_t id)
{
- int rc;
- lua_getglobal (L, "slurm_container_wait");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
+ int rc;
+ lua_getglobal (L, "slurm_container_wait");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
- lua_pushnumber (L, id);
+ lua_pushnumber (L, id);
- if (lua_pcall (L, 1, 1, 0) != 0)
- return error ("running lua function 'slurm_container_wait': %s",
- lua_tostring (L, -1));
+ if (lua_pcall (L, 1, 1, 0) != 0)
+ return error ("running lua function 'slurm_container_wait': %s",
+ lua_tostring (L, -1));
- rc = lua_tonumber (L, -1);
- lua_pop (L, -1);
- return (rc);
+ rc = lua_tonumber (L, -1);
+ lua_pop (L, -1);
+ return (rc);
}
int slurm_container_get_pids (uint32_t cont_id, pid_t **pids, int *npids)
{
- int i = 0;
- int t = 0;
- pid_t *p;
-
- lua_getglobal (L, "slurm_container_get_pids");
- if (lua_isnil (L, -1))
- return SLURM_FAILURE;
-
- lua_pushnumber (L, cont_id);
-
- if (lua_pcall (L, 1, 1, 0) != 0)
- return (error ("%s: %s: %s",
- "proctrack/lua",
- __func__,
- lua_tostring (L, -1)));
-
- /*
- * list of PIDs should be returned in a table from the lua
- * script. If a table wasn't returned then generate an error:
- */
- if (!lua_istable(L, -1))
- return (error ("%s: %s: function should return a table",
- "proctrack/lua",
- __func__));
-
- /*
- * Save absolute position of table in lua stack
- */
- t = lua_gettop (L);
-
- /*
- * Get table size and create array for slurm
- */
- *npids = lua_objlen (L, t);
- p = (pid_t *) xmalloc (*npids * sizeof (pid_t));
-
- /*
- * Traverse table/array at position t on the stack:
- */
- lua_pushnil (L);
- while (lua_next (L, t)) {
- p [i++] = lua_tonumber (L, -1);
- /*
- * pop value off stack, leave key for lua_next()
- */
- lua_pop (L, 1);
- }
- lua_pop (L, 1);
-
- *pids = p;
- return SLURM_SUCCESS;
+ int i = 0;
+ int t = 0;
+ pid_t *p;
+
+ lua_getglobal (L, "slurm_container_get_pids");
+ if (lua_isnil (L, -1))
+ return SLURM_FAILURE;
+
+ lua_pushnumber (L, cont_id);
+
+ if (lua_pcall (L, 1, 1, 0) != 0)
+ return (error ("%s: %s: %s",
+ "proctrack/lua",
+ __func__,
+ lua_tostring (L, -1)));
+
+ /*
+ * list of PIDs should be returned in a table from the lua
+ * script. If a table wasn't returned then generate an error:
+ */
+ if (!lua_istable(L, -1))
+ return (error ("%s: %s: function should return a table",
+ "proctrack/lua",
+ __func__));
+
+ /*
+ * Save absolute position of table in lua stack
+ */
+ t = lua_gettop (L);
+
+ /*
+ * Get table size and create array for slurm
+ */
+ *npids = lua_objlen (L, t);
+ p = (pid_t *) xmalloc (*npids * sizeof (pid_t));
+
+ /*
+ * Traverse table/array at position t on the stack:
+ */
+ lua_pushnil (L);
+ while (lua_next (L, t)) {
+ p [i++] = lua_tonumber (L, -1);
+ /*
+ * pop value off stack, leave key for lua_next()
+ */
+ lua_pop (L, 1);
+ }
+ lua_pop (L, 1);
+
+ *pids = p;
+ return SLURM_SUCCESS;
}
--
GitLab