Allow top-down evaluation for all promises

Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

cf-agent/cf-agent.c

@@ -1594,7 +1594,6 @@ PromiseResult ScheduleAgentOperationsNormalOrder(EvalContext *ctx, const Bundle
             {
                 continue;
             }
-            printf("N: Promise type: %s\n", sp->promise_type);
 
             NewTypeContext(type);
 
@@ -1662,6 +1661,20 @@ PromiseResult ScheduleAgentOperationsNormalOrder(EvalContext *ctx, const Bundle
     return result;
 }
 
+int PromiseCmpWrapper(const Promise *p1, const Promise *p2, void *user_data)
+{
+    UNUSED(user_data);
+    if (p1->order < p2->order)
+    {
+        return -1;
+    }
+    else if (p1->order > p2->order)
+    {
+        return 1;
+    }
+    return 0;
+}
+
 PromiseResult ScheduleAgentOperationsTopDownOrder(EvalContext *ctx, const Bundle *bp)
 {
     assert(bp != NULL);
@@ -1676,38 +1689,48 @@ PromiseResult ScheduleAgentOperationsTopDownOrder(EvalContext *ctx, const Bundle
         ClearProcessTable();
     }
 
+    Seq *promise_sequence = SeqNew(10, NULL);
+
+    const size_t sections = SeqLength(bp->sections);
+    for (size_t i = 0; i < sections; i++)
+    {
+        BundleSection *section = SeqAt(bp->sections, i);
+        const size_t promises = SeqLength(section->promises);
+
+        for (size_t j = 0; j < promises; j++)
+        {
+            SeqAppend(promise_sequence, SeqAt(section->promises, j));
+        }
+    }
+
+    SeqSort(promise_sequence, PromiseCmpWrapper, NULL);
+
     PromiseResult result = PROMISE_RESULT_SKIPPED;
     for (int pass = 1; pass < CF_DONEPASSES; pass++)
     {
-        const size_t sections = SeqLength(bp->all_sections);
-        EvalContextSetPass(ctx, 1);
-        for (size_t i = 0; i < sections; ++i)
+        for (size_t ppi = 0; ppi < SeqLength(promise_sequence); ppi++)
         {
-            BundleSection *section = SeqAt(bp->all_sections, i);
-
+            Promise *pp = SeqAt(promise_sequence, ppi);
+            BundleSection *parent_section = pp->parent_section;
+            printf("TP: %s\n", parent_section->promise_type);
 
-            SpecialTypeBannerFromString(section->promise_type, pass);
-            EvalContextStackPushBundleSectionFrame(ctx, section);
-            const size_t promises = SeqLength(section->promises);
+            EvalContextStackPushBundleSectionFrame(ctx, parent_section);
 
-            for (size_t ppi = 0; ppi < promises; ppi++)
+            PromiseResult promise_result = ExpandPromise(ctx, pp, KeepAgentPromise, NULL);
+            result = PromiseResultUpdate(result, promise_result);
+            if (EvalAborted(ctx) || BundleAbort(ctx))
             {
-                Promise *pp = SeqAt(section->promises, ppi);
-                PromiseResult promise_result = ExpandPromise(ctx, pp, KeepAgentPromise, NULL);
-                result = PromiseResultUpdate(result, promise_result);
-
-                if (EvalAborted(ctx) || BundleAbort(ctx))
-                {
-                    EvalContextStackPopFrame(ctx);
-                    NoteBundleCompliance(bp, save_pr_kept, save_pr_repaired, save_pr_notkept, start);
-                    return result;
-                }
+                EvalContextStackPopFrame(ctx);
+                NoteBundleCompliance(bp, save_pr_kept, save_pr_repaired, save_pr_notkept, start);
+                SeqDestroy(promise_sequence);
+                return result;
             }
             EvalContextStackPopFrame(ctx);
         }
     }
 
     NoteBundleCompliance(bp, save_pr_kept, save_pr_repaired, save_pr_notkept, start);
+    SeqDestroy(promise_sequence);
     return result;
 }
 

libpromises/policy.c

@@ -727,7 +727,6 @@ static bool PolicyCheckBundle(const Bundle *bundle, Seq *errors)
 
     success &= PolicyCheckBundleSections(bundle->sections, errors);
     success &= PolicyCheckBundleSections(bundle->custom_sections, errors);
-    success &= PolicyCheckBundleSections(bundle->all_sections, errors);
 
     return success;
 }
@@ -1321,9 +1320,8 @@ Bundle *PolicyAppendBundle(Policy *policy,
     bundle->ns = xstrdup(ns);
     bundle->args = RlistCopy(args);
     bundle->source_path = SafeStringDuplicate(source_path);
-    bundle->sections = SeqNew(10, NULL);
-    bundle->custom_sections = SeqNew(10, NULL);
-    bundle->all_sections = SeqNew(10, BundleSectionDestroy);
+    bundle->sections = SeqNew(10, BundleSectionDestroy);
+    bundle->custom_sections = SeqNew(10, BundleSectionDestroy);
 
     return bundle;
 }
@@ -1397,13 +1395,6 @@ BundleSection *BundleAppendSection(Bundle *bundle, const char *promise_type)
         ProgrammingError("Attempt to add a type without a bundle");
     }
 
-    BundleSection *section = xcalloc(1, sizeof(BundleSection));
-
-    section->parent_bundle = bundle;
-    section->promise_type = xstrdup(promise_type);
-    section->promises = SeqNew(10, PromiseDestroy);
-    SeqAppend(bundle->all_sections, section);
-
     // TODO: review SeqLookup
     for (size_t i = 0; i < SeqLength(bundle->sections); i++)
     {
@@ -1422,6 +1413,12 @@ BundleSection *BundleAppendSection(Bundle *bundle, const char *promise_type)
         }
     }
 
+    BundleSection *section = xcalloc(1, sizeof(BundleSection));
+
+    section->parent_bundle = bundle;
+    section->promise_type = xstrdup(promise_type);
+    section->promises = SeqNew(10, PromiseDestroy);
+
     if (IsBuiltInPromiseType(promise_type))
     {
         SeqAppend(bundle->sections, section);
@@ -1440,6 +1437,7 @@ Promise *BundleSectionAppendPromise(BundleSection *section, const char *promiser
 {
     assert(promiser && "Missing promiser");
     assert(section != NULL && "Missing promise type");
+    assert(section->parent_bundle != NULL);
 
     Promise *pp = xcalloc(1, sizeof(Promise));
 
@@ -1461,6 +1459,7 @@ Promise *BundleSectionAppendPromise(BundleSection *section, const char *promiser
     pp->promisee = promisee;
     pp->conlist = SeqNew(10, ConstraintDestroy);
     pp->org_pp = pp;
+    pp->order = section->parent_bundle->promise_count++;
 
     if (varclasses != NULL)
     {
@@ -1482,7 +1481,6 @@ static void BundleDestroy(Bundle *bundle)
         RlistDestroy(bundle->args);
         SeqDestroy(bundle->sections);
         SeqDestroy(bundle->custom_sections);
-        SeqDestroy(bundle->all_sections);
 
         free(bundle);
     }

libpromises/policy.h

@@ -71,6 +71,7 @@ typedef struct
 struct Bundle_
 {
     Policy *parent_policy;
+    int promise_count;
 
     char *type;
     char *name;
@@ -79,7 +80,6 @@ struct Bundle_
 
     Seq *sections;
     Seq *custom_sections;
-    Seq *all_sections; // kinda wasting space?
 
     char *source_path;
     SourceOffset offset;
@@ -114,6 +114,7 @@ struct BundleSection_
 struct Promise_
 {
     BundleSection *parent_section;
+    int order;
 
     char *classes;
     char *comment;