Convert context manipulation from stack+heap to just heap

10 files changed, 85 insertions, 76 deletions

diff --git a/src/cli/stasis_indexer/callbacks.c b/src/cli/stasis_indexer/callbacks.c
index 603aef9..20674f0 100644
--- a/src/cli/stasis_indexer/callbacks.c
+++ b/src/cli/stasis_indexer/callbacks.c
@@ -7,9 +7,9 @@
 
 // qsort callback to sort delivery contexts by compact python version
 int callback_sort_deliveries_cmpfn(const void *a, const void *b) {
-    const struct Delivery *delivery1 = (struct Delivery *) a;
+    const struct Delivery *delivery1 = *(struct Delivery **) a;
     const size_t delivery1_python = strtoul(delivery1->meta.python_compact, NULL, 10);
-    const struct Delivery *delivery2 = (struct Delivery *) b;
+    const struct Delivery *delivery2 = *(struct Delivery **) b;
     const size_t delivery2_python = strtoul(delivery2->meta.python_compact, NULL, 10);
 
     if (delivery2_python > delivery1_python) {
diff --git a/src/cli/stasis_indexer/helpers.c b/src/cli/stasis_indexer/helpers.c
index e455963..6dc653d 100644
--- a/src/cli/stasis_indexer/helpers.c
+++ b/src/cli/stasis_indexer/helpers.c
@@ -5,24 +5,24 @@
 #include "core.h"
 #include "helpers.h"
 
-struct StrList *get_architectures(struct Delivery ctx[], const size_t nelem) {
+struct StrList *get_architectures(struct Delivery **ctx, const size_t nelem) {
     struct StrList *architectures = strlist_init();
     for (size_t i = 0; i < nelem; i++) {
-        if (ctx[i].system.arch) {
-            if (!strstr_array(architectures->data, ctx[i].system.arch)) {
-                strlist_append(&architectures, ctx[i].system.arch);
+        if (ctx[i]->system.arch) {
+            if (!strstr_array(architectures->data, ctx[i]->system.arch)) {
+                strlist_append(&architectures, ctx[i]->system.arch);
             }
         }
     }
     return architectures;
 }
 
-struct StrList *get_platforms(struct Delivery ctx[], const size_t nelem) {
+struct StrList *get_platforms(struct Delivery **ctx, const size_t nelem) {
     struct StrList *platforms = strlist_init();
     for (size_t i = 0; i < nelem; i++) {
-        if (ctx[i].system.platform) {
-            if (!strstr_array(platforms->data, ctx[i].system.platform[DELIVERY_PLATFORM_RELEASE])) {
-                strlist_append(&platforms, ctx[i].system.platform[DELIVERY_PLATFORM_RELEASE]);
+        if (ctx[i]->system.platform) {
+            if (!strstr_array(platforms->data, ctx[i]->system.platform[DELIVERY_PLATFORM_RELEASE])) {
+                strlist_append(&platforms, ctx[i]->system.platform[DELIVERY_PLATFORM_RELEASE]);
             }
         }
     }
@@ -177,19 +177,19 @@ int micromamba_configure(const struct Delivery *ctx, struct MicromambaInfo *m) {
     return status;
 }
 
-int get_latest_rc(struct Delivery ctx[], const size_t nelem) {
+int get_latest_rc(struct Delivery **ctx, const size_t nelem) {
     int result = 0;
     for (size_t i = 0; i < nelem; i++) {
-        if (ctx[i].meta.rc > result) {
-            result = ctx[i].meta.rc;
+        if (ctx[i]->meta.rc > result) {
+            result = ctx[i]->meta.rc;
         }
     }
     return result;
 }
 
 int sort_by_latest_rc(const void *a, const void *b) {
-    const struct Delivery *aa = a;
-    const struct Delivery *bb = b;
+    const struct Delivery *aa = *(struct Delivery **) a;
+    const struct Delivery *bb = *(struct Delivery **) b;
     if (aa->meta.rc > bb->meta.rc) {
         return -1;
     } else if (aa->meta.rc < bb->meta.rc) {
diff --git a/src/cli/stasis_indexer/include/helpers.h b/src/cli/stasis_indexer/include/helpers.h
index b2b6131..6e2f93c 100644
--- a/src/cli/stasis_indexer/include/helpers.h
+++ b/src/cli/stasis_indexer/include/helpers.h
@@ -13,12 +13,11 @@
         for ((COUNTER) = 0; (X)[COUNTER].MEMBER != NULL; (COUNTER)++) {} \
     } while(0)
 
-struct StrList *get_architectures(struct Delivery ctx[], size_t nelem);
-struct StrList *get_platforms(struct Delivery ctx[], size_t nelem);
+struct StrList *get_architectures(struct Delivery **ctx, size_t nelem);
+struct StrList *get_platforms(struct Delivery **ctx, size_t nelem);
 int get_pandoc_version(size_t *result);
 int pandoc_exec(const char *in_file, const char *out_file, const char *css_file, const char *title);
-int get_latest_rc(struct Delivery ctx[], size_t nelem);
-struct Delivery *get_latest_deliveries(struct Delivery ctx[], size_t nelem);
+int get_latest_rc(struct Delivery **ctx, size_t nelem);
 struct Delivery **get_latest_deliveries(struct Delivery **ctx, size_t nelem, size_t *result_nelem);
 int get_files(struct StrList **out, const char *path, const char *pattern, ...);
 struct StrList *get_docker_images(struct Delivery *ctx, char *pattern);
diff --git a/src/cli/stasis_indexer/include/junitxml_report.h b/src/cli/stasis_indexer/include/junitxml_report.h
index 6d2a248..5747359 100644
--- a/src/cli/stasis_indexer/include/junitxml_report.h
+++ b/src/cli/stasis_indexer/include/junitxml_report.h
@@ -3,6 +3,6 @@
 
 #include "helpers.h"
 
-int indexer_junitxml_report(struct Delivery ctx[], size_t nelem);
+int indexer_junitxml_report(struct Delivery **ctx, size_t nelem);
 
 #endif //JUNITXML_REPORT_H
diff --git a/src/cli/stasis_indexer/include/readmes.h b/src/cli/stasis_indexer/include/readmes.h
index d4fa7ac..e14e681 100644
--- a/src/cli/stasis_indexer/include/readmes.h
+++ b/src/cli/stasis_indexer/include/readmes.h
@@ -3,6 +3,6 @@
 
 #include "helpers.h"
 
-int indexer_readmes(struct Delivery ctx[], size_t nelem);
+int indexer_readmes(struct Delivery **ctx, size_t nelem);
 
 #endif //READMES_H
diff --git a/src/cli/stasis_indexer/include/website.h b/src/cli/stasis_indexer/include/website.h
index e67d58b..83657a1 100644
--- a/src/cli/stasis_indexer/include/website.h
+++ b/src/cli/stasis_indexer/include/website.h
@@ -3,6 +3,6 @@
 
 #include "helpers.h"
 
-int indexer_make_website(const struct Delivery *ctx);
+int indexer_make_website(struct Delivery **ctx);
 
 #endif //WEBSITE_H
diff --git a/src/cli/stasis_indexer/junitxml_report.c b/src/cli/stasis_indexer/junitxml_report.c
index 904a3e5..21cf729 100644
--- a/src/cli/stasis_indexer/junitxml_report.c
+++ b/src/cli/stasis_indexer/junitxml_report.c
@@ -96,17 +96,17 @@ static int write_report_output(struct Delivery *ctx, FILE *destfp, const char *x
     return 0;
 }
 
-int indexer_junitxml_report(struct Delivery ctx[], const size_t nelem) {
+int indexer_junitxml_report(struct Delivery **ctx, const size_t nelem) {
     char indexfile[PATH_MAX] = {0};
-    sprintf(indexfile, "%s/README.md", ctx->storage.results_dir);
+    sprintf(indexfile, "%s/README.md", (*ctx)->storage.results_dir);
 
-    struct StrList *file_listing = listdir(ctx->storage.results_dir);
+    struct StrList *file_listing = listdir((*ctx)->storage.results_dir);
     if (!file_listing) {
         // no test results to process
         return 0;
     }
 
-    if (!pushd(ctx->storage.results_dir)) {
+    if (!pushd((*ctx)->storage.results_dir)) {
         FILE *indexfp = fopen(indexfile, "w+");
         if (!indexfp) {
             fprintf(stderr, "Unable to open %s for writing\n", indexfile);
@@ -114,21 +114,21 @@ int indexer_junitxml_report(struct Delivery ctx[], const size_t nelem) {
         }
         printf("Index %s opened for writing\n", indexfile);
 
-        int current_rc = ctx->meta.rc;
+        int current_rc = (*ctx)->meta.rc;
         for (size_t d = 0; d < nelem; d++) {
             char pattern[PATH_MAX] = {0};
-            snprintf(pattern, sizeof(pattern) - 1, "*%s*", ctx[d].info.release_name);
+            snprintf(pattern, sizeof(pattern) - 1, "*%s*", ctx[d]->info.release_name);
 
             // if the result directory contains tests for this release name, print them
             if (!is_file_in_listing(file_listing, pattern)) {
                 // no test results
                 continue;
             }
-            if (current_rc > ctx[d].meta.rc) {
-                current_rc = ctx[d].meta.rc;
+            if (current_rc > ctx[d]->meta.rc) {
+                current_rc = ctx[d]->meta.rc;
                 fprintf(indexfp, "\n\n---\n\n");
             }
-            fprintf(indexfp, "### %s\n", ctx[d].info.release_name);
+            fprintf(indexfp, "### %s\n", ctx[d]->info.release_name);
             fprintf(indexfp, "\n|Suite|Duration|Total|Pass|Fail|Skip|Error|\n");
             fprintf(indexfp, "|:----|:------:|:---:|:--:|:--:|:--:|:---:|\n");
 
@@ -139,7 +139,7 @@ int indexer_junitxml_report(struct Delivery ctx[], const size_t nelem) {
                     continue;
                 }
                 if (!fnmatch(pattern, filename, 0)) {
-                    if (write_report_output(&ctx[d], indexfp, filename)) {
+                    if (write_report_output(ctx[d], indexfp, filename)) {
                         // warn only
                         SYSERROR("Unable to write xml report file using %s", filename);
                     }
@@ -150,7 +150,7 @@ int indexer_junitxml_report(struct Delivery ctx[], const size_t nelem) {
         fclose(indexfp);
         popd();
     } else {
-        fprintf(stderr, "Unable to enter delivery directory: %s\n", ctx->storage.delivery_dir);
+        fprintf(stderr, "Unable to enter delivery directory: %s\n", (*ctx)->storage.delivery_dir);
         guard_strlist_free(&file_listing);
         return -1;
     }
diff --git a/src/cli/stasis_indexer/readmes.c b/src/cli/stasis_indexer/readmes.c
index 413a6a3..3dedb5c 100644
--- a/src/cli/stasis_indexer/readmes.c
+++ b/src/cli/stasis_indexer/readmes.c
@@ -1,8 +1,9 @@
 #include "core.h"
 #include "readmes.h"
 
-int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
-    struct Delivery *latest_deliveries = get_latest_deliveries(ctx, nelem);
+int indexer_readmes(struct Delivery **ctx, const size_t nelem) {
+    size_t nelem_real = 0;
+    struct Delivery **latest_deliveries = get_latest_deliveries(ctx, nelem, &nelem_real);
     if (!latest_deliveries) {
         if (errno) {
             return -1;
@@ -11,17 +12,17 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
     }
 
     char indexfile[PATH_MAX] = {0};
-    sprintf(indexfile, "%s/README.md", ctx->storage.delivery_dir);
+    sprintf(indexfile, "%s/README.md", (*ctx)->storage.delivery_dir);
 
     FILE *indexfp = fopen(indexfile, "w+");
     if (!indexfp) {
         fprintf(stderr, "Unable to open %s for writing\n", indexfile);
         return -1;
     }
-    struct StrList *archs = get_architectures(latest_deliveries, nelem);
-    struct StrList *platforms = get_platforms(latest_deliveries, nelem);
+    struct StrList *archs = get_architectures(latest_deliveries, nelem_real);
+    struct StrList *platforms = get_platforms(latest_deliveries, nelem_real);
 
-    fprintf(indexfp, "# %s-%s\n\n", ctx->meta.name, ctx->meta.version);
+    fprintf(indexfp, "# %s-%s\n\n", (*ctx)->meta.name, (*ctx)->meta.version);
     fprintf(indexfp, "## Current Release\n\n");
     strlist_sort(platforms, STASIS_SORT_ALPHA);
     strlist_sort(archs, STASIS_SORT_ALPHA);
@@ -31,10 +32,10 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
         for (size_t a = 0; a < strlist_count(archs); a++) {
             char *arch = strlist_item(archs, a);
             int have_combo = 0;
-            for (size_t i = 0; i < nelem; i++) {
-                if (latest_deliveries[i].system.platform) {
-                    if (strstr(latest_deliveries[i].system.platform[DELIVERY_PLATFORM_RELEASE], platform) &&
-                        strstr(latest_deliveries[i].system.arch, arch)) {
+            for (size_t i = 0; i < nelem_real; i++) {
+                if (latest_deliveries[i]->system.platform) {
+                    if (strstr(latest_deliveries[i]->system.platform[DELIVERY_PLATFORM_RELEASE], platform) &&
+                        strstr(latest_deliveries[i]->system.arch, arch)) {
                         have_combo = 1;
                     }
                 }
@@ -43,36 +44,36 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
                 continue;
             }
             fprintf(indexfp, "### %s-%s\n\n", platform, arch);
-            for (size_t i = 0; i < nelem; i++) {
+            for (size_t i = 0; i < nelem_real; i++) {
                 char link_name[PATH_MAX] = {0};
                 char readme_name[PATH_MAX] = {0};
                 char conf_name[PATH_MAX] = {0};
                 char conf_name_relative[PATH_MAX] = {0};
-                if (!latest_deliveries[i].meta.name) {
+                if (!latest_deliveries[i]->meta.name) {
                     continue;
                 }
-                sprintf(link_name, "latest-py%s-%s-%s.yml", latest_deliveries[i].meta.python_compact, latest_deliveries[i].system.platform[DELIVERY_PLATFORM_RELEASE], latest_deliveries[i].system.arch);
-                sprintf(readme_name, "README-py%s-%s-%s.md", latest_deliveries[i].meta.python_compact, latest_deliveries[i].system.platform[DELIVERY_PLATFORM_RELEASE], latest_deliveries[i].system.arch);
-                sprintf(conf_name, "%s.ini", latest_deliveries[i].info.release_name);
-                sprintf(conf_name_relative, "../config/%s.ini", latest_deliveries[i].info.release_name);
+                sprintf(link_name, "latest-py%s-%s-%s.yml", latest_deliveries[i]->meta.python_compact, latest_deliveries[i]->system.platform[DELIVERY_PLATFORM_RELEASE], latest_deliveries[i]->system.arch);
+                sprintf(readme_name, "README-py%s-%s-%s.md", latest_deliveries[i]->meta.python_compact, latest_deliveries[i]->system.platform[DELIVERY_PLATFORM_RELEASE], latest_deliveries[i]->system.arch);
+                sprintf(conf_name, "%s.ini", latest_deliveries[i]->info.release_name);
+                sprintf(conf_name_relative, "../config/%s.ini", latest_deliveries[i]->info.release_name);
                 if (strstr(link_name, platform) && strstr(link_name, arch)) {
-                    fprintf(indexfp, "- Python %s\n", latest_deliveries[i].meta.python);
+                    fprintf(indexfp, "- Python %s\n", latest_deliveries[i]->meta.python);
                     fprintf(indexfp, "  - Info: [README](%s)\n", readme_name);
                     fprintf(indexfp, "  - Release: [Conda Environment YAML](%s)\n", link_name);
                     fprintf(indexfp, "  - Receipt: [STASIS input file](%s)\n", conf_name_relative);
 
                     char *pattern = NULL;
                     asprintf(&pattern, "*%s*%s*",
-                             latest_deliveries[i].info.build_number,
-                             strstr(ctx->rules.release_fmt, "%p") ? latest_deliveries[i].meta.python_compact : "" );
+                             latest_deliveries[i]->info.build_number,
+                             strstr((*ctx)->rules.release_fmt, "%p") ? latest_deliveries[i]->meta.python_compact : "" );
                     if (!pattern) {
                         SYSERROR("%s", "Unable to allocate bytes for pattern");
                         return -1;
                     }
-                    struct StrList *docker_images = get_docker_images(&latest_deliveries[i], pattern);
+                    struct StrList *docker_images = get_docker_images(latest_deliveries[i], pattern);
                     if (docker_images
                         && strlist_count(docker_images)
-                        && !strcmp(latest_deliveries[i].system.platform[DELIVERY_PLATFORM_RELEASE], "linux")) {
+                        && !strcmp(latest_deliveries[i]->system.platform[DELIVERY_PLATFORM_RELEASE], "linux")) {
                         fprintf(indexfp, "  - Docker: ");
                         fprintf(indexfp, "[Archive](../packages/docker/%s)\n", path_basename(strlist_item(docker_images, 0)));
                     }
@@ -86,9 +87,9 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
     }
 
     fprintf(indexfp, "## Releases\n");
-    int current_rc = ctx->meta.rc;
-    for (size_t i = 0; ctx[i].meta.name != NULL; i++) {
-        struct Delivery *current = &ctx[i];
+    int current_rc = (*ctx)->meta.rc;
+    for (size_t i = 0; i < nelem_real; i++) {
+        struct Delivery *current = ctx[i];
         if (current_rc > current->meta.rc) {
             current_rc = current->meta.rc;
             fprintf(indexfp, "\n\n---\n\n");
@@ -101,7 +102,7 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) {
         char *pattern = NULL;
         asprintf(&pattern, "*%s*%s*",
                  current->info.build_number,
-                 strstr(ctx->rules.release_fmt, "%p") ? current->meta.python_compact : "" );
+                 strstr((*ctx)->rules.release_fmt, "%p") ? current->meta.python_compact : "" );
         if (!pattern) {
             SYSERROR("%s", "Unable to allocate bytes for pattern");
             return -1;
diff --git a/src/cli/stasis_indexer/stasis_indexer_main.c b/src/cli/stasis_indexer/stasis_indexer_main.c
index b4fafd4..107e8ca 100644
--- a/src/cli/stasis_indexer/stasis_indexer_main.c
+++ b/src/cli/stasis_indexer/stasis_indexer_main.c
@@ -67,27 +67,28 @@ int indexer_conda(const struct Delivery *ctx, struct MicromambaInfo m) {
     return status;
 }
 
-int indexer_symlinks(struct Delivery *ctx, const size_t nelem) {
-    struct Delivery *data = NULL;
-    data = get_latest_deliveries(ctx, nelem);
+int indexer_symlinks(struct Delivery **ctx, const size_t nelem) {
+    struct Delivery **data = NULL;
+    size_t nelem_real = 0;
+    data = get_latest_deliveries(ctx, nelem, &nelem_real);
     //int latest = get_latest_rc(ctx, nelem);
 
-    if (!pushd(ctx->storage.delivery_dir)) {
-        for (size_t i = 0; i < nelem; i++) {
+    if (!pushd((*ctx)->storage.delivery_dir)) {
+        for (size_t i = 0; i < nelem_real; i++) {
             char link_name_spec[PATH_MAX];
             char link_name_readme[PATH_MAX];
 
             char file_name_spec[PATH_MAX];
             char file_name_readme[PATH_MAX];
 
-            if (!data[i].meta.name) {
+            if (!data[i]->meta.name) {
                 continue;
             }
-            sprintf(link_name_spec, "latest-py%s-%s-%s.yml", data[i].meta.python_compact, data[i].system.platform[DELIVERY_PLATFORM_RELEASE], data[i].system.arch);
-            sprintf(file_name_spec, "%s.yml", data[i].info.release_name);
+            sprintf(link_name_spec, "latest-py%s-%s-%s.yml", data[i]->meta.python_compact, data[i]->system.platform[DELIVERY_PLATFORM_RELEASE], data[i]->system.arch);
+            sprintf(file_name_spec, "%s.yml", data[i]->info.release_name);
 
-            sprintf(link_name_readme, "README-py%s-%s-%s.md", data[i].meta.python_compact, data[i].system.platform[DELIVERY_PLATFORM_RELEASE], data[i].system.arch);
-            sprintf(file_name_readme, "README-%s.md", data[i].info.release_name);
+            sprintf(link_name_readme, "README-py%s-%s-%s.md", data[i]->meta.python_compact, data[i]->system.platform[DELIVERY_PLATFORM_RELEASE], data[i]->system.arch);
+            sprintf(file_name_readme, "README-%s.md", data[i]->info.release_name);
 
             if (!access(link_name_spec, F_OK)) {
                 if (unlink(link_name_spec)) {
@@ -116,7 +117,7 @@ int indexer_symlinks(struct Delivery *ctx, const size_t nelem) {
         }
         popd();
     } else {
-        fprintf(stderr, "Unable to enter delivery directory: %s\n", ctx->storage.delivery_dir);
+        fprintf(stderr, "Unable to enter delivery directory: %s\n", (*ctx)->storage.delivery_dir);
         guard_free(data);
         return -1;
     }
@@ -325,7 +326,7 @@ int main(const int argc, char *argv[]) {
     get_files(&metafiles, ctx.storage.meta_dir, "*.stasis");
     strlist_sort(metafiles, STASIS_SORT_LEN_ASCENDING);
 
-    struct Delivery *local = calloc(strlist_count(metafiles) + 1, sizeof(*local));
+    struct Delivery **local = calloc(strlist_count(metafiles) + 1, sizeof(*local));
     if (!local) {
         SYSERROR("%s", "Unable to allocate bytes for local delivery context array");
         exit(1);
@@ -334,11 +335,15 @@ int main(const int argc, char *argv[]) {
     for (size_t i = 0; i < strlist_count(metafiles); i++) {
         char *item = strlist_item(metafiles, i);
         // Copy the pre-filled contents of the main delivery context
-        memcpy(&local[i], &ctx, sizeof(ctx));
+        local[i] = delivery_duplicate(&ctx);
+        if (!local[i]) {
+            SYSERROR("%s", "Unable to duplicate delivery context %zu", i);
+            exit(1);
+        }
         if (globals.verbose) {
             puts(item);
         }
-        load_metadata(&local[i], item);
+        load_metadata(local[i], item);
     }
     qsort(local, strlist_count(metafiles), sizeof(*local), callback_sort_deliveries_cmpfn);
 
@@ -430,10 +435,14 @@ int main(const int argc, char *argv[]) {
 
     guard_free(destdir);
     guard_array_free(rootdirs);
-    guard_strlist_free(&metafiles);
     guard_free(m.micromamba_prefix);
     delivery_free(&ctx);
+    for (size_t i = 0; i < strlist_count(metafiles); i++) {
+        delivery_free(local[i]);
+        guard_free(local[i]);
+    }
     guard_free(local);
+    guard_strlist_free(&metafiles);
     globals_free();
 
     msg(STASIS_MSG_L1, "Done!\n");
diff --git a/src/cli/stasis_indexer/website.c b/src/cli/stasis_indexer/website.c
index 55f0c45..966391e 100644
--- a/src/cli/stasis_indexer/website.c
+++ b/src/cli/stasis_indexer/website.c
@@ -1,7 +1,7 @@
 #include "core.h"
 #include "website.h"
 
-int indexer_make_website(const struct Delivery *ctx) {
+int indexer_make_website(struct Delivery **ctx) {
     char *css_filename = calloc(PATH_MAX, sizeof(*css_filename));
     if (!css_filename) {
         SYSERROR("unable to allocate string for CSS file path: %s", strerror(errno));
@@ -12,8 +12,8 @@ int indexer_make_website(const struct Delivery *ctx) {
     const int have_css = access(css_filename, F_OK | R_OK) == 0;
 
     struct StrList *dirs = strlist_init();
-    strlist_append(&dirs, ctx->storage.delivery_dir);
-    strlist_append(&dirs, ctx->storage.results_dir);
+    strlist_append(&dirs, (*ctx)->storage.delivery_dir);
+    strlist_append(&dirs, (*ctx)->storage.results_dir);
 
     struct StrList *inputs = NULL;
     for (size_t i = 0; i < strlist_count(dirs); i++) {