Pushes some pending changes.

Author: Robert Mijaković

EnoptMP.c

@@ -40,7 +40,7 @@ int32_t init( void )
 {
     debug_printf( "EnoptMP: %s: Entering\n", __func__ );
 
-    if( init_enopt_wrapper() != 0 )
+    if( enopt_init() != 0 )
     {
         printf( "EnoptMP: %s: enopt_init: Unable to initialize enopt metric source\n", __func__ );
         return -1;
@@ -174,7 +174,7 @@ void fini( void )
     debug_printf( "EnoptMP: %s: Entering\n", __func__ );
     enopt_stop();
 
-    if( finalize_enopt_wrapper() != 0 )
+    if( enopt_finalize() != 0 )
     {
        printf( "EnoptMP: %s: Unable to finalize enopt metric source\n", __func__ );
        abort();

Shared.c

@@ -8,7 +8,6 @@
 
 
 const char* ENV_VAR_DEBUG_OUTPUT = "ENOPT_ENABLE_DEBUG_OUTPUT";
-const char* ENV_VAR_INIT_COUNTER = "ENOPT_INIT_COUNT";
 
 
 void debug_printf(const char* format, ...) {
@@ -20,46 +19,3 @@ void debug_printf(const char* format, ...) {
     vfprintf(stderr, format, ap);
     va_end(ap);
 }
-
-
-int read_count() {
-    const char* countStr = getenv(ENV_VAR_INIT_COUNTER);
-    return countStr  ?  strtol(countStr, NULL, 10) : 0;
-}
-
-
-void write_count(int count) {
-    char str[16];
-    sprintf(str, "%d", count);
-    setenv(ENV_VAR_INIT_COUNTER, str, 1);
-}
-
-
-int init_enopt_wrapper() {
-    int count = read_count();
-    int result = (count == 0)  ?  enopt_init() : 0;
-    write_count(++count);
-    debug_printf("NOTE: After increasing, the new init count is: %i\n", count);
-
-    return result;
-}
-
-
-int finalize_enopt_wrapper() {
-    int count = read_count();
-    if( count <= 0 ) {
-        printf("ERROR: Finalize called more often than initialize!\n");
-        abort();
-    }
-
-    int result = 0;
-    if( count == 1 ) {
-        debug_printf("NOTE: Init count is going to 0, finalizing Enopt...\n");
-        result = enopt_finalize();
-    }
-
-    write_count(--count);
-    debug_printf("NOTE: After decreasing, the new init count is: %i\n", count);
-
-    return result;
-}