Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

src/pio_server.c

@@ -452,6 +452,15 @@ cdiPioNetCDFParChunk(int vlistID, int varID, Xt_idxlist *preWriteChunk, struct P
 }
 #endif
 
+static void
+allocUIDLookup(size_t numClients, Xt_uid *restrict *uids, int *restrict *partSizes)
+{
+  size_t uidBytes = sizeof(**uids) * (numClients + 1), partSizesBytes = sizeof(**partSizes) * (numClients + 1),
+         partSizeAlign = sizeof(**partSizes), uidBytesRoundUp = ((uidBytes + partSizeAlign - 1) / partSizeAlign * partSizeAlign);
+  *uids = Malloc(uidBytes + uidBytesRoundUp + partSizesBytes);
+  *partSizes = (int *) (void *) ((unsigned char *) *uids + uidBytes + uidBytesRoundUp);
+}
+
 static Xt_redist
 buildVarRedist(int headerIdx, size_t streamIdx,
                /* index list representing the data elements gathered on
@@ -473,12 +482,7 @@ buildVarRedist(int headerIdx, size_t streamIdx,
   bool cacheXmaps = conf->cacheXmaps;
   if (cacheXmaps)
     {
-      {
-        size_t uidBytes = sizeof(*uids) * (numClients + 1), partSizesBytes = sizeof(*partSizes) * (numClients + 1),
-               partSizeAlign = sizeof(*partSizes), uidBytesRoundUp = (uidBytes + partSizeAlign - 1) / partSizeAlign * partSizeAlign;
-        uids = Malloc(uidBytes + uidBytesRoundUp + partSizesBytes);
-        partSizes = (int *) (void *) ((unsigned char *) uids + uidBytes + uidBytesRoundUp);
-      }
+      allocUIDLookup(numClients, &uids, &partSizes);
       uids[0] = xt_idxlist_get_uid(dstList);
       for (size_t clientIdx = 0; clientIdx < numClients; ++clientIdx)
         {