diff --git a/src/plugins/sched/wiki2/job_modify.c b/src/plugins/sched/wiki2/job_modify.c
index 72030e90aea4602caec59a2e75bb083c45c2d1b6..0d18125fcbd3c08009fa4b16a9b235f472bece6f 100644
--- a/src/plugins/sched/wiki2/job_modify.c
+++ b/src/plugins/sched/wiki2/job_modify.c
@@ -40,7 +40,8 @@
#include "src/slurmctld/locks.h"
#include "src/slurmctld/slurmctld.h"
-static void _null_term(char *str)
+/* Given a string, replace the first space found with '\0' */
+extern void null_term(char *str)
{
char *tmp_ptr;
for (tmp_ptr=str; ; tmp_ptr++) {
@@ -147,11 +148,13 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
}
host_fini: if (rc) {
- info("wiki: change job %u invalid hostlist %s", jobid, new_hostlist);
+ info("wiki: change job %u invalid hostlist %s",
+ jobid, new_hostlist);
xfree(job_ptr->details->req_nodes);
return EINVAL;
} else {
- info("wiki: change job %u hostlist %s", jobid, new_hostlist);
+ info("wiki: change job %u hostlist %s",
+ jobid, new_hostlist);
}
}
@@ -231,17 +234,17 @@ extern int job_modify_wiki(char *cmd_ptr, int *err_code, char **err_msg)
if (bank_ptr) {
bank_ptr[4] = ':';
bank_ptr += 5;
- _null_term(bank_ptr);
+ null_term(bank_ptr);
}
if (depend_ptr) {
depend_ptr[6] = ':';
depend_ptr += 7;
- _null_term(depend_ptr);
+ null_term(depend_ptr);
}
if (host_ptr) {
host_ptr[8] = ':';
host_ptr += 9;
- _null_term(bank_ptr);
+ null_term(bank_ptr);
}
if (nodes_ptr) {
nodes_ptr[5] = ':';
@@ -251,7 +254,7 @@ extern int job_modify_wiki(char *cmd_ptr, int *err_code, char **err_msg)
if (part_ptr) {
part_ptr[9] = ':';
part_ptr += 10;
- _null_term(part_ptr);
+ null_term(part_ptr);
}
if (time_ptr) {
time_ptr[9] = ':';
diff --git a/src/plugins/sched/wiki2/job_will_run.c b/src/plugins/sched/wiki2/job_will_run.c
index 637a112b09dec2ee9e6a4c94a0d41a187225924b..e1346d1fcb3a3d9226abd0d314b598a1a6edc06d 100644
--- a/src/plugins/sched/wiki2/job_will_run.c
+++ b/src/plugins/sched/wiki2/job_will_run.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* job_will_run.c - Process Wiki job will_run test
*****************************************************************************
- * Copyright (C) 2006 The Regents of the University of California.
+ * Copyright (C) 2006-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* UCRL-CODE-226842.
@@ -240,7 +240,7 @@ static char * _copy_nodelist_no_dup(char *node_list)
* IN bitmap - bitmap pointer
* RET pointer to node list or NULL on error
* globals: node_record_table_ptr - pointer to node table
- * NOTE: the caller must xfree the memory at node_list when no longer required
+ * NOTE: the caller must xfree the returned pointer when no longer required
*/
extern char * bitmap2wiki_node_name(bitstr_t *bitmap)
{
diff --git a/src/plugins/sched/wiki2/msg.c b/src/plugins/sched/wiki2/msg.c
index 800d4b1fd2a3424710f989d5298b1f2e9c2f9336..fc4fa02e0902df726dfb2793153d85f0e8ac7409 100644
--- a/src/plugins/sched/wiki2/msg.c
+++ b/src/plugins/sched/wiki2/msg.c
@@ -338,6 +338,11 @@ extern int parse_wiki_config(void)
return SLURM_SUCCESS;
}
+/*
+ * Return a string containing any scheduling plugin configuration information
+ * that we want to expose via "scontrol show configuration".
+ * NOTE: the caller must xfree the returned pointer
+ */
extern char * get_wiki_conf(void)
{
int i, first = 1;
diff --git a/src/plugins/sched/wiki2/msg.h b/src/plugins/sched/wiki2/msg.h
index 0419d04cc63ab16405a66e62352c099ba8f503e6..3fcacceed5eff7d9b7b000cd9ccac156cb59f3a5 100644
--- a/src/plugins/sched/wiki2/msg.h
+++ b/src/plugins/sched/wiki2/msg.h
@@ -98,14 +98,55 @@ extern uint16_t job_aggregation_time;
extern uint16_t kill_wait;
extern uint16_t use_host_exp;
+/*
+ * bitmap2wiki_node_name - given a bitmap, build a list of colon separated
+ * node names (if we can't use node range expressions), or the
+ * normal slurm node name expression
+ *
+ * IN bitmap - bitmap pointer
+ * RET pointer to node list or NULL on error
+ * globals: node_record_table_ptr - pointer to node table
+ * NOTE: the caller must xfree the returned pointer when no longer required
+ */
extern char * bitmap2wiki_node_name(bitstr_t *bitmap);
+
+/*
+ * event_notify - Notify Moab of some event
+ * event_code IN - message code to send Moab
+ * 1234 - job state change
+ * 1235 - partition state change
+ * desc IN - event description
+ * RET 0 on success, -1 on failure
+ */
extern int event_notify(int event_code, char *desc);
-extern int spawn_msg_thread(void);
+
+/*
+ * Spawn message hander thread
+ */
+extern int spawn_msg_thread(void);
+
+/*
+ * Terminate message hander thread
+ */
extern void term_msg_thread(void);
+
+/*
+ * Return a string containing any scheduling plugin configuration information
+ * that we want to expose via "scontrol show configuration".
+ * NOTE: the caller must xfree the returned pointer
+ */
extern char * get_wiki_conf(void);
-/* Functions called from within msg.c (rather than creating a bunch
- * more header files with one function definition each */
+/*
+ * Given a string, replace the first space found with '\0'
+ */
+extern void null_term(char *str);
+
+
+/*
+ * Functions called from within msg.c (rather than creating a bunch
+ * more header files with one function definition each)
+ */
extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg);
extern int get_jobs(char *cmd_ptr, int *err_code, char **err_msg);
extern int get_nodes(char *cmd_ptr, int *err_code, char **err_msg);