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/cdipio.h

@@ -136,13 +136,38 @@ void cdiPioConfSetCSRole(int confResH, int CSRole);
 int cdiPioConfGetCSRole(int confResH);
 
 /* cdiPioConfSetPostCommSetupActions: set function to be called after
- * setup of client/server communications of configuration object */
+ * setup of client/server communications of configuration object.
+ * Deprecated: use cdiPioConfSetCallBackActions with
+ * trigger == CDIPIO_CALLBACK_POSTCOMMSETUP in new programs */
 void cdiPioConfSetPostCommSetupActions(int confResH, void (*postCommSetupActions)(void));
 
 /* cdiPioConfGetPostCommSetupActions: get function to be called after
- * setup of client/server communications from configuration object */
+ * setup of client/server communications from configuration object.
+ * Deprecated: use cdiPioConfGetCallBackActions with
+ * trigger == CDIPIO_CALLBACK_POSTCOMMSETUP in new programs. */
 void (*cdiPioConfGetPostCommSetupActions(int confResH))(void);
 
+/* CDIPIO_CALLBACK_POSTCOMMSETUP: trigger number of the hook called
+ * after communication has been established. This is the same hook
+ * previously setup with cdiPioConfSetPostCommSetupActions, takes no
+ * argument */
+#define CDIPIO_CALLBACK_POSTCOMMSETUP 0
+/* CDIPIO_CALLBACK_POSTSTREAMCLOSE: trigger number for callback
+ * invoked after each streamClose on the collector side.
+ * Accepts the streamID as int parameter, i.e. use INTEGER, VALUE and
+ * BIND(C) on Fortran side
+ */
+#define CDIPIO_CALLBACK_POSTSTREAMCLOSE 1
+
+/* cdiPioConfSetCallBack: set function to be called at
+ * indicated trigger of configuration object, action will be cast to
+ * the appropriate type as indicated for the respective trigger */
+void cdiPioConfSetCallBackActions(int confResH, int trigger, void (*action)(void));
+
+/* cdiPioConfGetCallBack: query function to be called at
+ * indicated trigger of configuration object */
+void (*cdiPioConfGetCallBackActions(int confResH, int trigger))(void);
+
 /* cdiPioConfSetLargePageAlign should block buffer be aligned to
  * large pages instead of normal pages? */
 void cdiPioConfSetLargePageAlign(int confResH, int largePageAlign);