[svn-r25537] VOL framework changes.

1 files changed, 137 insertions, 113 deletions

diff --git a/src/H5trace.c b/src/H5trace.c
index 4b33898..ddf376c 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -2434,9 +2434,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             H5VL_attr_get_t get = (H5VL_attr_get_t)va_arg(ap, int);
 
                             switch(get) {
-                                case H5VL_ATTR_EXISTS:
-                                    fprintf(out, "H5VL_ATTR_EXISTS");
-                                    break;
                                 case H5VL_ATTR_GET_SPACE:
                                     fprintf(out, "H5VL_ATTR_GET_SPACE");
                                     break;
@@ -2461,7 +2458,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 'd':
+                    case 'b':
+                        if(ptr) {
+                            if(vp)
+                                fprintf (out, "0x%lx", (unsigned long)vp);
+                            else
+                                fprintf(out, "NULL");
+                        } /* end if */
+                        else {
+                            H5VL_attr_specific_t specific = (H5VL_attr_specific_t)va_arg(ap, int);
+
+                            switch(specific) {
+                                case H5VL_ATTR_DELETE:
+                                    fprintf(out, "H5VL_ATTR_DELETE");
+                                    break;
+                                case H5VL_ATTR_EXISTS:
+                                    fprintf(out, "H5VL_ATTR_EXISTS");
+                                    break;
+                                case H5VL_ATTR_ITER:
+                                    fprintf(out, "H5VL_ATTR_ITER");
+                                    break;
+                                case H5VL_ATTR_RENAME:
+                                    fprintf(out, "H5VL_ATTR_RENAME");
+                                    break;
+                                default:
+                                    fprintf(out, "%ld", (long)specific);
+                                    break;
+                            } /* end switch */
+                        } /* end else */
+                        break;
+                    case 'c':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2499,6 +2525,49 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             } /* end switch */
                         } /* end else */
                         break;
+                    case 'd':
+                        if(ptr) {
+                            if(vp)
+                                fprintf (out, "0x%lx", (unsigned long)vp);
+                            else
+                                fprintf(out, "NULL");
+                        } /* end if */
+                        else {
+                            H5VL_dataset_specific_t specific = (H5VL_dataset_specific_t)va_arg(ap, int);
+
+                            switch(specific) {
+                                case H5VL_DATASET_SET_EXTENT:
+                                    fprintf(out, "H5VL_DATASET_SPECIFIC_SPACE");
+                                    break;
+                                default:
+                                    fprintf(out, "%ld", (long)specific);
+                                    break;
+                            } /* end switch */
+                        } /* end else */
+                        break;
+                    case 'e':
+                        if(ptr) {
+                            if(vp)
+                                fprintf (out, "0x%lx", (unsigned long)vp);
+                            else
+                                fprintf(out, "NULL");
+                        } /* end if */
+                        else {
+                            H5VL_datatype_get_t get = (H5VL_datatype_get_t)va_arg(ap, int);
+
+                            switch(get) {
+                                case H5VL_DATATYPE_GET_BINARY:
+                                    fprintf(out, "H5VL_DATATYPE_GET_BINARY");
+                                    break;
+                                case H5VL_DATATYPE_GET_TCPL:
+                                    fprintf(out, "H5VL_DATATYPE_GET_TCPL");
+                                    break;
+                                default:
+                                    fprintf(out, "%ld", (long)get);
+                                    break;
+                            } /* end switch */
+                        } /* end else */
+                        break;
                     case 'f':
                         if(ptr) {
                             if(vp)
@@ -2507,6 +2576,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
+                            H5VL_datatype_specific_t specific = (H5VL_datatype_specific_t)va_arg(ap, int);
+
+                            switch(specific) {
+                                case H5VL_DATATYPE_SPECIFIC_INVALID:
+                                default:
+                                    fprintf(out, "%ld", (long)specific);
+                                    break;
+                            } /* end switch */
+                        } /* end else */
+                        break;
+                    case 'g':
+                        if(ptr) {
+                            if(vp)
+                                fprintf (out, "0x%lx", (unsigned long)vp);
+                            else
+                                fprintf(out, "NULL");
+                        } /* end if */
+                        else {
                             H5VL_file_get_t get = (H5VL_file_get_t)va_arg(ap, int);
 
                             switch(get) {
@@ -2537,7 +2624,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 'm':
+                    case 'h':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2545,9 +2632,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_file_misc_t misc = (H5VL_file_misc_t)va_arg(ap, int);
+                            H5VL_file_specific_t specific = (H5VL_file_specific_t)va_arg(ap, int);
 
-                            switch(misc) {
+                            switch(specific) {
+                                case H5VL_FILE_FLUSH:
+                                    fprintf(out, "H5VL_FILE_FLUSH");
+                                    break;
                                 case H5VL_FILE_MOUNT:
                                     fprintf(out, "H5VL_FILE_MOUNT");
                                     break;
@@ -2558,68 +2648,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     fprintf(out, "H5VL_FILE_IS_ACCESSIBLE");
                                     break;
                                 default:
-                                    fprintf(out, "%ld", (long)misc);
+                                    fprintf(out, "%ld", (long)specific);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 'n':
-                        if(ptr) {
-                            if(vp)
-                                fprintf (out, "0x%lx", (unsigned long)vp);
-                            else
-                                fprintf(out, "NULL");
-                        } /* end if */
-                        else {
-                            H5VL_file_optional_t op = (H5VL_file_optional_t)va_arg(ap, int);
-
-                            switch(op) {
-                                case H5VL_FILE_CLEAR_ELINK_CACHE:
-                                    fprintf(out, "H5VL_FILE_CLEAR_ELINK_CACHE");
-                                    break;
-                                case H5VL_FILE_GET_FILE_IMAGE:
-                                    fprintf(out, "H5VL_FILE_GET_FILE_IMAGE");
-                                    break;
-                                case H5VL_FILE_GET_FREE_SECTIONS:
-                                    fprintf(out, "H5VL_FILE_GET_FREE_SECTIONS");
-                                    break;
-                                case H5VL_FILE_GET_FREE_SPACE:
-                                    fprintf(out, "H5VL_FILE_GET_FREE_SPACE");
-                                    break;
-                                case H5VL_FILE_GET_INFO:
-                                    fprintf(out, "H5VL_FILE_GET_INFO");
-                                    break;
-                                case H5VL_FILE_GET_MDC_CONF:
-                                    fprintf(out, "H5VL_FILE_GET_MDC_CONF");
-                                    break;
-                                case H5VL_FILE_GET_MDC_HR:
-                                    fprintf(out, "H5VL_FILE_GET_MDC_HR");
-                                    break;
-                                case H5VL_FILE_GET_MDC_SIZE:
-                                    fprintf(out, "H5VL_FILE_GET_MDC_SIZE");
-                                    break;
-                                case H5VL_FILE_GET_SIZE:
-                                    fprintf(out, "H5VL_FILE_GET_SIZE");
-                                    break;
-                                case H5VL_FILE_GET_VFD_HANDLE:
-                                    fprintf(out, "H5VL_FILE_GET_VFD_HANDLE");
-                                    break;
-                                case H5VL_FILE_REOPEN:
-                                    fprintf(out, "H5VL_FILE_REOPEN");
-                                    break;
-                                case H5VL_FILE_RESET_MDC_HIT_RATE:
-                                    fprintf(out, "H5VL_FILE_RESET_MDC_HIT_RATE");
-                                    break;
-                                case H5VL_FILE_SET_MDC_CONFIG:
-                                    fprintf(out, "H5VL_FILE_SET_MDC_CONFIG");
-                                    break;
-                                default:
-                                    fprintf(out, "%ld", (long)op);
-                                    break;
-                            } /* end switch */
-                        } /* end else */
-                        break;
-                    case 'g':
+                    case 'i':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2642,7 +2676,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 't':
+                    case 'j':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2650,19 +2684,17 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_datatype_get_t get = (H5VL_datatype_get_t)va_arg(ap, int);
+                            H5VL_group_specific_t specific = (H5VL_group_specific_t)va_arg(ap, int);
 
-                            switch(get) {
-                                case H5VL_DATATYPE_GET_TCPL:
-                                    fprintf(out, "H5VL_DATATYPE_GET_TCPL");
-                                    break;
+                            switch(specific) {
+                                case H5VL_GROUP_SPECIFIC_INVALID:
                                 default:
-                                    fprintf(out, "%ld", (long)get);
+                                    fprintf(out, "%ld", (long)specific);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 'c':
+                    case 'k':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2699,9 +2731,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             H5VL_link_get_t get = (H5VL_link_get_t)va_arg(ap, int);
 
                             switch(get) {
-                                case H5VL_LINK_EXISTS:
-                                    fprintf(out, "H5VL_LINK_EXISTS");
-                                    break;
                                 case H5VL_LINK_GET_INFO:
                                     fprintf(out, "H5VL_LINK_GET_INFO");
                                     break;
@@ -2717,7 +2746,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                             } /* end switch */
                         } /* end else */
                         break;
-                    case 'x':
+                    case 'm':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2725,29 +2754,25 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_object_misc_t misc = (H5VL_object_misc_t)va_arg(ap, int);
+                            H5VL_link_specific_t specific = (H5VL_link_specific_t)va_arg(ap, int);
 
-                            switch(misc) {
-                                case H5VL_ATTR_RENAME:
-                                    fprintf(out, "H5VL_ATTR_RENAME");
+                            switch(specific) {
+                                case H5VL_LINK_DELETE:
+                                    fprintf(out, "H5VL_LINK_DELETE");
                                     break;
-                                case H5VL_OBJECT_CHANGE_REF_COUNT:
-                                    fprintf(out, "H5VL_OBJECT_CHANGE_REF_COUNT");
-                                    break;
-                                case H5VL_OBJECT_SET_COMMENT:
-                                    fprintf(out, "H5VL_OBJECT_SET_COMMENT");
+                                case H5VL_LINK_EXISTS:
+                                    fprintf(out, "H5VL_LINK_EXISTS");
                                     break;
-                                case H5VL_REF_CREATE:
-                                    fprintf(out, "H5VL_REF_CREATE");
+                                case H5VL_LINK_ITER:
+                                    fprintf(out, "H5VL_LINK_ITER");
                                     break;
                                 default:
-                                    fprintf(out, "%ld", (long)misc);
+                                    fprintf(out, "%ld", (long)specific);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
-
-                    case 'p':
+                    case 'n':
                         if(ptr) {
                             if(vp)
                                 fprintf (out, "0x%lx", (unsigned long)vp);
@@ -2755,19 +2780,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_object_optional_t op = (H5VL_object_optional_t)va_arg(ap, int);
+                            H5VL_object_get_t get = (H5VL_object_get_t)va_arg(ap, int);
 
-                            switch(op) {
-                                case H5VL_OPTIONAL:
-                                    fprintf(out, "H5VL_OPTIONAL");
+                            switch(get) {
+                                case H5VL_REF_GET_REGION:
+                                    fprintf(out, "H5VL_REF_GET_REGION");
+                                    break;
+                                case H5VL_REF_GET_TYPE:
+                                    fprintf(out, "H5VL_REF_GET_TYPE");
+                                    break;
+                                case H5VL_REF_GET_NAME:
+                                    fprintf(out, "H5VL_REF_GET_NAME");
                                     break;
                                 default:
-                                    fprintf(out, "%ld", (long)op);
+                                    fprintf(out, "%ld", (long)get);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
-
                     case 'o':
                         if(ptr) {
                             if(vp)
@@ -2776,29 +2806,23 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 fprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_object_get_t get = (H5VL_object_get_t)va_arg(ap, int);
+                            H5VL_object_specific_t specific = (H5VL_object_specific_t)va_arg(ap, int);
 
-                            switch(get) {
+                            switch(specific) {
+                                case H5VL_OBJECT_CHANGE_REF_COUNT:
+                                    fprintf(out, "H5VL_OBJECT_CHANGE_REF_COUNT");
+                                    break;
                                 case H5VL_OBJECT_EXISTS:
                                     fprintf(out, "H5VL_OBJECT_EXISTS");
                                     break;
-                                case H5VL_OBJECT_GET_INFO:
-                                    fprintf(out, "H5VL_OBJECT_GET_INFO");
-                                    break;
-                                case H5VL_OBJECT_GET_COMMENT:
-                                    fprintf(out, "H5VL_OBJECT_GET_COMMENT");
-                                    break;
-                                case H5VL_REF_GET_REGION:
-                                    fprintf(out, "H5VL_REF_GET_REGION");
-                                    break;
-                                case H5VL_REF_GET_TYPE:
-                                    fprintf(out, "H5VL_REF_GET_TYPE");
+                                case H5VL_OBJECT_VISIT:
+                                    fprintf(out, "H5VL_OBJECT_VISIT");
                                     break;
-                                case H5VL_REF_GET_NAME:
-                                    fprintf(out, "H5VL_REF_GET_NAME");
+                                case H5VL_REF_CREATE:
+                                    fprintf(out, "H5VL_REF_CREATE");
                                     break;
                                 default:
-                                    fprintf(out, "%ld", (long)get);
+                                    fprintf(out, "%ld", (long)specific);
                                     break;
                             } /* end switch */
                         } /* end else */