From 77813ab10c8adb932013fcb9f1bc1e4dcd13d40f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 10 Jun 2008 00:17:15 +0000
Subject: [PATCH] once again a change we have to make to the accounting api

---
 src/common/slurm_accounting_storage.c | 6 ++++++
 src/common/slurm_accounting_storage.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index 5154aeaf348..866d9a65d0e 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -1219,6 +1219,7 @@ extern void pack_acct_cluster_cond(void *in, Buf buffer)
 		}
 		list_iterator_destroy(itr);
 	}
+	pack16((uint16_t)object->with_usage, buffer);
 }
 
 extern int unpack_acct_cluster_cond(void **object, Buf buffer)
@@ -1238,6 +1239,7 @@ extern int unpack_acct_cluster_cond(void **object, Buf buffer)
 			list_append(object_ptr->cluster_list, tmp_info);
 		}
 	}
+	safe_unpack16((uint16_t *)&object_ptr->with_usage, buffer);
 
 	return SLURM_SUCCESS;
 
@@ -1267,6 +1269,7 @@ extern void pack_acct_association_cond(void *in, Buf buffer)
 		pack32(0, buffer);
 		packnull(buffer);
 		pack32(0, buffer);
+		pack16(0, buffer);
 		return;
 	}
 
@@ -1342,6 +1345,8 @@ extern void pack_acct_association_cond(void *in, Buf buffer)
 		list_iterator_destroy(itr);
 	}
 	count = 0;
+
+	pack16((uint16_t)object->with_usage, buffer);
 }
 
 extern int unpack_acct_association_cond(void **object, Buf buffer)
@@ -1407,6 +1412,7 @@ extern int unpack_acct_association_cond(void **object, Buf buffer)
 		}
 	}
 
+	safe_unpack16(&object_ptr->with_usage, buffer);
 	return SLURM_SUCCESS;
 
 unpack_error:
diff --git a/src/common/slurm_accounting_storage.h b/src/common/slurm_accounting_storage.h
index 59b439bcd1f..5d4879b5183 100644
--- a/src/common/slurm_accounting_storage.h
+++ b/src/common/slurm_accounting_storage.h
@@ -88,6 +88,7 @@ typedef struct {
 	List partition_list;	/* list of char * */
 	char *parent_acct;	/* name of parent account */
 	List user_list;		/* list of char * */
+	uint16_t with_usage; 
 } acct_association_cond_t;
 
 typedef struct {
@@ -143,6 +144,7 @@ typedef struct acct_association_rec {
 
 typedef struct {
 	List cluster_list; /* list of char * */
+	uint16_t with_usage; 
 } acct_cluster_cond_t;
 
 typedef struct {
-- 
GitLab