Add convenient functions to get contract budget and period

[frescor/frsh.git] / fres / contract / fres_contract.h

diff --git a/fres/contract/fres_contract.h b/fres/contract/fres_contract.h
index 5f426c36d34fcd2064715e939c293e789ef78c64..15087077ac425f9795148c1096722b8b6afb4b51 100644 (file)
--- a/fres/contract/fres_contract.h
+++ b/fres/contract/fres_contract.h
@@ -88,8 +88,8 @@ static inline bool fres_contract_id_is_empty(const fres_contract_id_t *id)
        bool empty = true;
        unsigned i;
 
-       for (i=0; i<sizeof(*id); i++) {
-               if (((char*)id)[i] != 0) {
+       for (i=0; i<sizeof(id->byte); i++) {
+               if (id->byte[i] != 0) {
                        empty = false;
                        break;
                }
@@ -106,6 +106,14 @@ static inline char *fres_contract_id_to_string(char *dest,
 
 struct fres_contract *fres_contract_new(void);
 void fres_contract_destroy(struct fres_contract *contract);
+
+/** Destructor for easy use in forb_sequence_free() */
+static inline void fres_contract_ptr_destroy(struct fres_contract **p)
+{
+       fres_contract_destroy(*p);
+}
+
+
 struct fres_contract *fres_contract_duplicate(struct fres_contract *src);
 
 /** 
@@ -163,9 +171,23 @@ fres_contract_get_block(struct fres_contract *contract,
 int
 fres_contract_to_string(char *dest, size_t size, const struct fres_contract *c);
 
+/* #define FRES_C2S_FL_FMT_ONELINE */
+/* #define FRES_C2S_FL_FMT_BLOCKPERLINE */
+int
+fres_contract_to_string2(char *dest, size_t size, const struct fres_contract *c, int indent, uint32_t flags);
+
 bool
 fres_contract_get_deadline(const frsh_contract_t *contract,
                           frsh_rel_time_t       *deadline);
+bool
+fres_contract_get_budget(const frsh_contract_t *contract,
+                        frsh_rel_time_t       *budget);
+bool
+fres_contract_get_period(const frsh_contract_t *contract,
+                        frsh_rel_time_t       *period);
+frsh_contract_type_t
+fres_contract_get_type(const frsh_contract_t *contract);
+
 void
 fres_contract_print(char *prefix, const struct fres_contract *c);
 
@@ -222,6 +244,7 @@ FRES_CONTRACT_ACCESSOR(basic)
 FRES_CONTRACT_ACCESSOR(timing_reqs)
 FRES_CONTRACT_ACCESSOR(csects)
 FRES_CONTRACT_ACCESSOR(spare_capacity)
+FRES_CONTRACT_ACCESSOR(power_management)
 
 #ifdef __cplusplus
 } /* extern "C"*/