ceed - create CEED_MAX_BACKEND_PRIORITY, use to repair registry list reporting

Author: jeremylt

backends/ceed-backend-weak.c

@@ -1,5 +1,4 @@
 #include <ceed/backend.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -18,7 +17,7 @@ static int CeedRegister_Weak(const char *name, int num_prefixes, ...) {
   va_start(prefixes, num_prefixes);
   int ierr;
   for (int i=0; i<num_prefixes; i++) {
-    ierr = CeedRegister(va_arg(prefixes, const char*), CeedInit_Weak, UINT_MAX);
+    ierr = CeedRegister(va_arg(prefixes, const char*), CeedInit_Weak, CEED_MAX_BACKEND_PRIORITY);
     CeedChk(ierr);
   }
   va_end(prefixes);

include/ceed/backend.h

@@ -20,12 +20,14 @@
 #define _ceed_backend_h
 
 #include <ceed/ceed.h>
+#include <limits.h>
 #include <stdbool.h>
 
 #define CEED_INTERN CEED_EXTERN __attribute__((visibility ("hidden")))
 #define CEED_UNUSED __attribute__((unused))
 
 #define CEED_MAX_RESOURCE_LEN 1024
+#define CEED_MAX_BACKEND_PRIORITY UINT_MAX
 #define CEED_ALIGN 64
 #define CEED_COMPOSITE_MAX 16
 #define CEED_EPSILON 1E-16

interface/ceed.c

@@ -610,7 +610,7 @@ int CeedSetData(Ceed ceed, void *data) {
 // LCOV_EXCL_START
 int CeedRegistryGetList(size_t *n, char ***const resources,
                         CeedInt **priorities) {
-  *n = num_backends;
+  *n = 0;
   *resources = malloc(num_backends * sizeof(**resources));
   if (!resources)
     return CeedError(NULL, CEED_ERROR_MAJOR, "malloc() failure");
@@ -620,8 +620,20 @@ int CeedRegistryGetList(size_t *n, char ***const resources,
       return CeedError(NULL, CEED_ERROR_MAJOR, "malloc() failure");
   }
   for (size_t i=0; i<num_backends; i++) {
-    *resources[i] = backends[i].prefix;
-    if (priorities) *priorities[i] = backends[i].priority;
+    // Only report compiled backends
+    if (backends[i].priority < CEED_MAX_BACKEND_PRIORITY) {
+      *resources[i] = backends[i].prefix;
+      if (priorities) *priorities[i] = backends[i].priority;
+      *n += 1;
+    }
+  }
+  *resources = realloc(*resources, *n * sizeof(**resources));
+  if (!resources)
+    return CeedError(NULL, CEED_ERROR_MAJOR, "realloc() failure");
+  if (priorities) {
+    *priorities = realloc(*priorities, *n * sizeof(**priorities));
+    if (!priorities)
+      return CeedError(NULL, CEED_ERROR_MAJOR, "realloc() failure");
   }
   return CEED_ERROR_SUCCESS;
 };
@@ -643,7 +655,8 @@ int CeedRegistryGetList(size_t *n, char ***const resources,
 **/
 int CeedInit(const char *resource, Ceed *ceed) {
   int ierr;
-  size_t match_len = 0, match_idx = UINT_MAX, match_priority = UINT_MAX, priority;
+  size_t match_len = 0, match_idx = UINT_MAX,
+         match_priority = CEED_MAX_BACKEND_PRIORITY, priority;
 
   // Find matching backend
   if (!resource)
@@ -663,7 +676,9 @@ int CeedInit(const char *resource, Ceed *ceed) {
             CEED_VERSION_RELEASE ? "" : "+development");
     fprintf(stderr, "Available backend resources:\n");
     for (size_t i=0; i<num_backends; i++) {
-      fprintf(stderr, "  %s\n", backends[i].prefix);
+      // Only report compiled backends
+      if (backends[i].priority < CEED_MAX_BACKEND_PRIORITY)
+        fprintf(stderr, "  %s\n", backends[i].prefix);
     }
     fflush(stderr);
     match_help = 5; // Delineating character expected