From 33c11ed7b1a51b17cc94e8275a678f8e149ffefa Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 9 Aug 2007 18:11:43 +0000
Subject: [PATCH] update the perl api to mirror what the slurm.h file looks
like now. Haven't checked to make sure we don't have any more new functions
in the api itself we need to look at.
---
contribs/perlapi/libslurm-perl/alloc.c | 3 +--
contribs/perlapi/libslurm-perl/conf.c | 28 ++++++++++++++++++++++--
contribs/perlapi/libslurm-perl/trigger.c | 2 +-
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/contribs/perlapi/libslurm-perl/alloc.c b/contribs/perlapi/libslurm-perl/alloc.c
index 90a6eeb234a..0910813b3eb 100644
--- a/contribs/perlapi/libslurm-perl/alloc.c
+++ b/contribs/perlapi/libslurm-perl/alloc.c
@@ -112,9 +112,8 @@ hv_to_job_desc_msg(HV* hv, job_desc_msg_t* job_desc_msg)
FETCH_FIELD(hv, job_desc_msg, work_dir, charp, FALSE);
FETCH_FIELD(hv, job_desc_msg, alloc_node, charp, FALSE);
FETCH_FIELD(hv, job_desc_msg, alloc_sid, uint32_t, FALSE);
- FETCH_FIELD(hv, job_desc_msg, alloc_resp_hostname, charp, FALSE);
+ FETCH_FIELD(hv, job_desc_msg, resp_host, charp, FALSE);
FETCH_FIELD(hv, job_desc_msg, alloc_resp_port, uint16_t, FALSE);
- FETCH_FIELD(hv, job_desc_msg, other_hostname, charp, FALSE);
FETCH_FIELD(hv, job_desc_msg, other_port, uint16_t, FALSE);
FETCH_FIELD(hv, job_desc_msg, dependency, uint32_t, FALSE);
FETCH_FIELD(hv, job_desc_msg, overcommit, uint16_t, FALSE);
diff --git a/contribs/perlapi/libslurm-perl/conf.c b/contribs/perlapi/libslurm-perl/conf.c
index 12d4a4e6b91..af3d658d160 100644
--- a/contribs/perlapi/libslurm-perl/conf.c
+++ b/contribs/perlapi/libslurm-perl/conf.c
@@ -23,6 +23,7 @@ slurm_ctl_conf_to_hv(slurm_ctl_conf_t* conf, HV* hv)
STORE_FIELD(hv, conf, backup_addr, charp);
if(conf->backup_controller)
STORE_FIELD(hv, conf, backup_controller, charp);
+ STORE_FIELD(hv, conf, boot_time, time_t);
STORE_FIELD(hv, conf, cache_groups, uint16_t);
if(conf->checkpoint_type)
STORE_FIELD(hv, conf, checkpoint_type, charp);
@@ -30,17 +31,28 @@ slurm_ctl_conf_to_hv(slurm_ctl_conf_t* conf, HV* hv)
STORE_FIELD(hv, conf, control_addr, charp);
if(conf->control_machine)
STORE_FIELD(hv, conf, control_machine, charp);
+ if(conf->crypto_type)
+ STORE_FIELD(hv, conf, crypto_type, charp);
if(conf->epilog)
STORE_FIELD(hv, conf, epilog, charp);
STORE_FIELD(hv, conf, first_job_id, uint32_t);
STORE_FIELD(hv, conf, next_job_id, uint32_t);
STORE_FIELD(hv, conf, fast_schedule, uint16_t);
STORE_FIELD(hv, conf, inactive_limit, uint16_t);
- if(conf->job_acct_logfile)
- STORE_FIELD(hv, conf, job_acct_logfile, charp);
+ if(conf->job_acct_loc)
+ STORE_FIELD(hv, conf, job_acct_loc, charp);
STORE_FIELD(hv, conf, job_acct_freq, uint16_t);
if(conf->job_acct_type)
STORE_FIELD(hv, conf, job_acct_type, charp);
+ if(conf->database_type)
+ STORE_FIELD(hv, conf, database_type, charp);
+ if(conf->database_user)
+ STORE_FIELD(hv, conf, database_user, charp);
+ if(conf->database_host)
+ STORE_FIELD(hv, conf, database_host, charp);
+ if(conf->database_pass)
+ STORE_FIELD(hv, conf, database_pass, charp);
+ STORE_FIELD(hv, conf, database_port, uint32_t);
if(conf->job_comp_type)
STORE_FIELD(hv, conf, job_comp_type, charp);
if(conf->job_comp_loc)
@@ -57,6 +69,7 @@ slurm_ctl_conf_to_hv(slurm_ctl_conf_t* conf, HV* hv)
STORE_FIELD(hv, conf, plugindir, charp);
if(conf->plugstack)
STORE_FIELD(hv, conf, plugstack, charp);
+ STORE_FIELD(hv, conf, private_data, uint16_t);
if(conf->proctrack_type)
STORE_FIELD(hv, conf, proctrack_type, charp);
if(conf->prolog)
@@ -67,6 +80,9 @@ slurm_ctl_conf_to_hv(slurm_ctl_conf_t* conf, HV* hv)
if(conf->propagate_rlimits_except)
STORE_FIELD(hv, conf, propagate_rlimits_except, charp);
STORE_FIELD(hv, conf, ret2service, uint16_t);
+ STORE_FIELD(hv, conf, resume_rate, uint16_t);
+ if(conf->resume_program)
+ STORE_FIELD(hv, conf, resume_program, charp);
if(conf->schedtype)
STORE_FIELD(hv, conf, schedtype, charp);
STORE_FIELD(hv, conf, schedport, uint16_t);
@@ -97,6 +113,14 @@ slurm_ctl_conf_to_hv(slurm_ctl_conf_t* conf, HV* hv)
STORE_FIELD(hv, conf, slurm_conf, charp);
if(conf->state_save_location)
STORE_FIELD(hv, conf, state_save_location, charp);
+ if(conf->suspend_exc_nodes)
+ STORE_FIELD(hv, conf, suspend_exc_nodes, charp);
+ if(conf->suspend_exc_parts)
+ STORE_FIELD(hv, conf, suspend_exc_parts, charp);
+ if(conf->suspend_program)
+ STORE_FIELD(hv, conf, suspend_program, charp);
+ STORE_FIELD(hv, conf, suspend_rate, uint16_t);
+ STORE_FIELD(hv, conf, suspend_time, uint16_t);
if(conf->switch_type)
STORE_FIELD(hv, conf, switch_type, charp);
if(conf->task_epilog)
diff --git a/contribs/perlapi/libslurm-perl/trigger.c b/contribs/perlapi/libslurm-perl/trigger.c
index 29dae41192a..56f65162a48 100644
--- a/contribs/perlapi/libslurm-perl/trigger.c
+++ b/contribs/perlapi/libslurm-perl/trigger.c
@@ -16,7 +16,7 @@ int
trigger_info_to_hv(trigger_info_t* trigger_info, HV* hv)
{
STORE_FIELD(hv, trigger_info, trig_id, uint32_t);
- STORE_FIELD(hv, trigger_info, res_type, uint8_t);
+ STORE_FIELD(hv, trigger_info, res_type, uint16_t);
if(trigger_info->res_id)
STORE_FIELD(hv, trigger_info, res_id, charp);
STORE_FIELD(hv, trigger_info, trig_type, uint16_t);
--
GitLab