Merge pull request #471 from PCMDI/458_switch_from_ossuuid_to_libuuid

mauzey1 · web-flow · commit 484d53c85ced · 2019-04-24T11:34:57.000-07:00
458 switch from ossuuid to libuuid
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ aliases:
        conda config --set always_yes yes --set changeps1 no
        conda update -y -q conda
        conda config --set anaconda_upload no
-       conda create -q -n py$PYTHON_VERSION -c cdat/label/nightly -c conda-forge -c cdat ossuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=$PYTHON_VERSION $CONDA_COMPILERS testsrunner
+       conda create -q -n py$PYTHON_VERSION -c cdat/label/nightly -c conda-forge -c cdat libuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=$PYTHON_VERSION $CONDA_COMPILERS testsrunner
 
   - &setup_cmor
     name: setup_cmor
diff --git a/.travis.yml b/.travis.yml
@@ -31,9 +31,9 @@ before_install:
   - conda update -y -q conda
   - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CONDA_COMPILERS="gcc_linux-64 gfortran_linux-64"; fi
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then export CONDA_COMPILERS="clang_osx-64 gfortran_osx-64"; fi
-  - if [[ $CMOR_PYTHON_VERSION == '2.7' ]]; then conda create -q -n py2.7 -c cdat/label/nightly -c conda-forge -c cdat ossuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=2.7 $CONDA_COMPILERS testsrunner; fi
-  - if [[ $CMOR_PYTHON_VERSION == '3.6' ]]; then conda create -q -n py3.6 -c cdat/label/nightly -c conda-forge -c cdat ossuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=3.6 $CONDA_COMPILERS testsrunner; fi
-  - if [[ $CMOR_PYTHON_VERSION == '3.7' ]]; then conda create -q -n py3.7 -c cdat/label/nightly -c conda-forge -c cdat ossuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=3.7 $CONDA_COMPILERS testsrunner; fi
+  - if [[ $CMOR_PYTHON_VERSION == '2.7' ]]; then conda create -q -n py2.7 -c cdat/label/nightly -c conda-forge -c cdat libuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=2.7 $CONDA_COMPILERS testsrunner; fi
+  - if [[ $CMOR_PYTHON_VERSION == '3.6' ]]; then conda create -q -n py3.6 -c cdat/label/nightly -c conda-forge -c cdat libuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=3.6 $CONDA_COMPILERS testsrunner; fi
+  - if [[ $CMOR_PYTHON_VERSION == '3.7' ]]; then conda create -q -n py3.7 -c cdat/label/nightly -c conda-forge -c cdat libuuid udunits2 hdf5 libnetcdf numpy openssl lazy-object-proxy cdms2 python=3.7 $CONDA_COMPILERS testsrunner; fi
   - if [[ $CMOR_PYTHON_VERSION == '2.7' ]]; then source activate py2.7; fi
   - if [[ $CMOR_PYTHON_VERSION == '3.6' ]]; then source activate py3.6; fi
   - if [[ $CMOR_PYTHON_VERSION == '3.7' ]]; then source activate py3.7; fi
diff --git a/Src/cmor.c b/Src/cmor.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
 #include <unistd.h>
 #include <string.h>
 #include "json.h"
@@ -3089,43 +3089,35 @@ int cmor_attNameCmp(const void *v1, const void *v2)
 /************************************************************************/
 void cmor_generate_uuid()
 {
-    uuid_t *myuuid;
-    uuid_fmt_t fmt;
-    void *myuuid_str = NULL;
-    size_t uuidlen;
+    uuid_t myuuid;
+    char myuuid_str[37]; // 36 characters + '\0'
     char value[CMOR_MAX_STRING];
 
     cmor_add_traceback("cmor_generate_uuid");
 
 /* -------------------------------------------------------------------- */
 /*      generates a new unique id                                       */
 /* -------------------------------------------------------------------- */
-    uuid_create(&myuuid);
-    uuid_make(myuuid, 4);
-
-    myuuid_str = NULL;
-    fmt = UUID_FMT_STR;
+    uuid_generate(myuuid);
 
 /* -------------------------------------------------------------------- */
 /*      Write tracking_id and tracking_prefix                           */
 /* -------------------------------------------------------------------- */
-    uuid_export(myuuid, fmt, &myuuid_str, &uuidlen);
+    uuid_unparse(myuuid, myuuid_str);
 
     if (cmor_has_cur_dataset_attribute(GLOBAL_ATT_TRACKING_PREFIX) == 0) {
         cmor_get_cur_dataset_attribute(GLOBAL_ATT_TRACKING_PREFIX, value);
 
         strncpy(cmor_current_dataset.tracking_id, value, CMOR_MAX_STRING);
         strcat(cmor_current_dataset.tracking_id, "/");
-        strcat(cmor_current_dataset.tracking_id, (char *)myuuid_str);
+        strcat(cmor_current_dataset.tracking_id, myuuid_str);
     } else {
-        strncpy(cmor_current_dataset.tracking_id, (char *)myuuid_str,
+        strncpy(cmor_current_dataset.tracking_id, myuuid_str,
                 CMOR_MAX_STRING);
     }
     cmor_set_cur_dataset_attribute_internal(GLOBAL_ATT_TRACKING_ID,
                                             cmor_current_dataset.tracking_id,
                                             0);
-    free(myuuid_str);
-    uuid_destroy(myuuid);
     cmor_pop_traceback();
 
 }
diff --git a/configure b/configure
@@ -4033,9 +4033,9 @@ else
   UUIDFLAGS=""
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_create in -luuid" >&5
-$as_echo_n "checking for uuid_create in -luuid... " >&6; }
-if ${ac_cv_lib_uuid_uuid_create+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -4049,27 +4049,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char uuid_create ();
+char uuid_generate ();
 int
 main ()
 {
-return uuid_create ();
+return uuid_generate ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_uuid_uuid_create=yes
+  ac_cv_lib_uuid_uuid_generate=yes
 else
-  ac_cv_lib_uuid_uuid_create=no
+  ac_cv_lib_uuid_uuid_generate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_create" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_create" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_create" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBUUID 1
 _ACEOF
diff --git a/configure.ac b/configure.ac
@@ -185,7 +185,7 @@ else
   UUIDLDFLAGS="-luuid"
   UUIDFLAGS=""
 fi
-AC_CHECK_LIB([uuid],[uuid_create],[],[AC_ERROR([Could not get a working uuid])],[ ${UUIDFLAGS} ${UUIDLDFLAGS}  ])
+AC_CHECK_LIB([uuid],[uuid_generate],[],[AC_ERROR([Could not get a working uuid])],[ ${UUIDFLAGS} ${UUIDLDFLAGS}  ])
 
 LIBS=""
 AC_ARG_WITH([udunits2],[AS_HELP_STRING([--with-udunits2],[enable support for udunits2 in none standard location])],[],[with_udunits2="no"])
diff --git a/recipes/cmor/meta.yaml.in b/recipes/cmor/meta.yaml.in
@@ -21,7 +21,7 @@ requirements:
     - {{ compiler("fortran") }}
   host:
     - python {{ python }}
-    - ossuuid 1.6.2
+    - libuuid
     - udunits2
     - six
     - hdf5
@@ -31,7 +31,7 @@ requirements:
     - cdms2
   run:
     - python {{ python }}
-    - ossuuid 1.6.2
+    - libuuid
     - udunits2
     - six
     - {{ pin_compatible('numpy') }}
