From 05b59105110f342dc7cc58005a924fd152ddb194 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 8 Sep 2011 14:34:34 -0700
Subject: [PATCH] Add "State" field to reservation information
Add State=ACTIVE or State=INACTIVE to "scontrol show reservation" output.
Patch from Phil Eckert, LLNL.
---
src/api/reservation_info.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/api/reservation_info.c b/src/api/reservation_info.c
index 294faaa2965..d82a248d3c0 100644
--- a/src/api/reservation_info.c
+++ b/src/api/reservation_info.c
@@ -105,8 +105,10 @@ char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
{
char tmp1[32], tmp2[32], tmp3[32], *flag_str = NULL;
char tmp_line[MAXHOSTRANGELEN];
+ char *state="INACTIVE";
char *out = NULL;
uint32_t duration;
+ time_t now = time(NULL);
/****** Line 1 ******/
slurm_make_time_str(&resv_ptr->start_time, tmp1, sizeof(tmp1));
@@ -138,9 +140,11 @@ char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
xstrcat(out, "\n ");
/****** Line 3 ******/
+ if ((resv_ptr->start_time <= now) && (resv_ptr->end_time >= now))
+ state = "ACTIVE";
snprintf(tmp_line, sizeof(tmp_line),
- "Users=%s Accounts=%s Licenses=%s",
- resv_ptr->users, resv_ptr->accounts, resv_ptr->licenses);
+ "Users=%s Accounts=%s Licenses=%s State=%s",
+ resv_ptr->users, resv_ptr->accounts, resv_ptr->licenses, state);
xstrcat(out, tmp_line);
if (one_liner)
xstrcat(out, "\n");
--
GitLab