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_dbuffer.c

@@ -6,6 +6,7 @@
 #define _XOPEN_SOURCE 600
 #endif
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -18,95 +19,54 @@
 #include "pio_impl.h"
 #include "pio_util.h"
 
-static bool localDebug = false;
-
 int
 dbuffer_init(struct dBuffer **dbuffer, size_t size)
 {
-  struct dBuffer *db;
   int status;
-  size_t pagesize;
+  assert(dbuffer);
+  struct dBuffer *db = *dbuffer = (struct dBuffer *) Malloc(sizeof(*db));
+  db->wr_pointer = 0;
 
 #ifndef _SX
-  pagesize = (size_t) sysconf(_SC_PAGESIZE);
-
-  if (localDebug) fprintf(stdout, "dbuffer_init(): pagesize = %zu bytes, size = %zu \n", pagesize, size);
+  size_t pagesize = (size_t) (sysconf(_SC_PAGESIZE));
 
-  if (dbuffer == NULL || size < pagesize)
-    {
-
-      fprintf(stdout, "dbuffer_init: dbuffer=NULL\n");
-      return 1;
-    }
-  db = (struct dBuffer *) malloc(sizeof(struct dBuffer));
+  xdebug("dbuffer_init(): pagesize = %zu bytes, size = %zu", pagesize, size);
 
-  if (db == NULL)
-    {
-      perror("Not enough memory");
-      return 1;
-    }
-
-  db->size = pagesize;
-  while (db->size < size)
-    {
-      db->size <<= 1;
-      if (localDebug) fprintf(stdout, "size correction: %zu\n", db->size);
-    }
-
-  db->wr_pointer = 0;
-
-  if ((status = posix_memalign((void **) &db->buffer, pagesize, sizeof(char) * (db->size))) != 0)
+  db->size = size = (size + pagesize - 1) / pagesize * pagesize;
+  void *buf = NULL;
+  if ((status = posix_memalign(&buf, pagesize, size)) != 0)
     {
       switch (status)
         {
         case EINVAL:
-          fprintf(stderr, "The alignment argument was not a power of two, or was not a multiple of sizeof(void *).\n");
+          xabort("The alignment argument was not a power of two,"
+                 " or was not a multiple of sizeof(void *).");
+#ifndef __GNUC__
+          break;
+#endif
+        case ENOMEM:
+          xabort("There was insufficient memory to fulfill the"
+                 " allocation request.");
+#ifndef __GNUC__
           break;
-        case ENOMEM: fprintf(stderr, "There was insufficient memory to fulfill the allocation request.\n"); break;
+#endif
         }
     }
+  db->buffer = (unsigned char *) buf;
 #else
-
-  if (dbuffer == NULL)
-    {
-      fprintf(stdout, "dbuffer_init: dbuffer=NULL\n");
-      return 1;
-    }
-
-  db = (struct dBuffer *) malloc(sizeof(struct dBuffer));
-
-  if (db == NULL)
-    {
-      perror("Not enough memory");
-      return 1;
-    }
-
   db->size = size;
-
-  db->wr_pointer = 0;
-
-  db->buffer = (unsigned char *) malloc(sizeof(unsigned char) * (db->size));
-  if (db->buffer == NULL)
-    {
-      perror("Not enough memory");
-      free(db);
-      return 1;
-    }
+  db->buffer = (unsigned char *) malloc(size);
+  assert(db->buffer);
 #endif
-
-  *dbuffer = db;
-
   return 0;
 }
 
 void
 dbuffer_cleanup(struct dBuffer **dbuffer)
 {
-  struct dBuffer *db;
+  struct dBuffer *db = *dbuffer;
 
-  db = *dbuffer;
-
-  Free(db->buffer);
+  free(db->buffer);
   Free(db);
 
   return;
@@ -115,20 +75,13 @@ dbuffer_cleanup(struct dBuffer **dbuffer)
 size_t
 dbuffer_data_size(struct dBuffer *dbuffer)
 {
-  size_t data_size;
-
-  data_size = (size_t) (dbuffer->wr_pointer & (dbuffer->size - 1));
-
-  return data_size;
+  return dbuffer->wr_pointer;
 }
 
 static size_t
 dbuffer_freesize(struct dBuffer *dbuffer)
 {
-  size_t free_size;
-
-  free_size = (size_t) (dbuffer->size - 1 - dbuffer_data_size(dbuffer));
-
+  size_t free_size = (size_t) (dbuffer->size - dbuffer_data_size(dbuffer));
   return free_size;
 }
 
@@ -136,27 +89,22 @@ int
 dbuffer_reset(struct dBuffer *dbuffer)
 {
   dbuffer->wr_pointer = 0;
-
   return 0;
 }
 
 int
 dbuffer_push(struct dBuffer *dbuffer, const void *buffer, size_t len)
 {
-  size_t space_left;
-  size_t wr_ptr;
-
-  space_left = dbuffer_freesize(dbuffer);
-  if (len > space_left)
+  size_t space_left = dbuffer_freesize(dbuffer);
+  if (len <= space_left)
     {
-      return 1; /* not enough space left */
+      size_t wr_ptr = dbuffer->wr_pointer;
+      memcpy(dbuffer->buffer + wr_ptr, buffer, len);
+      dbuffer->wr_pointer = wr_ptr + len;
+      return 0;
     }
-
-  wr_ptr = dbuffer->wr_pointer;
-  memcpy(dbuffer->buffer + wr_ptr, buffer, len);
-  dbuffer->wr_pointer = wr_ptr + len;
-
-  return 0;
+  else
+    return 1; /* not enough space left */
 }
 
 /*