From 1b2c200b10842b78ac53677c83025504f38dc47e Mon Sep 17 00:00:00 2001 From: Leon Arber Date: Tue, 27 Feb 2007 20:57:03 -0500 Subject: [svn-r13429] Purpose: Bug Fix Description: Fix up the bin/trace script. The script has been updated to include all of the new datatypes that have been added to the library. It's output has also been made a bit clearer with regards to the NO TRACE comment scattered throughout the code which prevents tracing information from being added. The script cannot handle functions that take a variable number of arguments nor can it deal with functions whose prototype differs based on certain preprocessor directives. However, there are only 3 instances of this in the library. All other warnings that the script used to generated have been fixed. The script has not actually been run on the source files yet. Tested: smirom --- bin/trace | 113 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 60 insertions(+), 53 deletions(-) diff --git a/bin/trace b/bin/trace index eb99d73..7f7c9f3 100755 --- a/bin/trace +++ b/bin/trace @@ -29,95 +29,102 @@ $Source = ""; # usually the same as the package name. # %TypeString = ("haddr_t" => "a", + "H5A_operator_t" => "Ao", + "H5A_info_t" => "Ai", + "H5A_operator2_t" => "Ap", "hbool_t" => "b", + "H5AC_cache_config_t" => "c", "double" => "d", - "H5_iter_order_t" => "Io", - "H5_index_t" => "Ii", - "H5D_alloc_time_t" => "Da", + "H5D_alloc_time_t" => "Da", "H5D_fill_time_t" => "Df", "H5D_fill_value_t" => "DF", "H5D_layout_t" => "Dl", "H5D_space_status_t" => "Ds", "H5FD_mpio_xfer_t" => "Dt", + "H5FD_mpio_collective_opt_t" => "Dc", + "H5FD_mpio_chunk_opt_t" => "Dh", + "H5D_operator_t" => "Do", "herr_t" => "e", + "H5E_auto_stack_t" => "Ea", + "H5E_auto_t" => "Eb", "H5E_direction_t" => "Ed", - "H5E_error_t*" => "Ee", - "H5E_major_t" => "i", - "H5E_minor_t" => "i", + "H5E_error_t" => "Ee", "H5E_type_t" => "Et", + "H5E_walk_stack_t" => "Es", + "H5E_walk_t" => "Ew", + "FILE" => "f", + "H5FD_class_t" => "Fc", "H5F_close_degree_t" => "Fd", + "H5FD_t" => "Ff", "H5F_scope_t" => "Fs", + "H5FD_stream_fapl_t" => "Ft", + "H5E_major_t" => "g", + "H5G_iterate_t" => "Gi", + "H5G_info_t" => "Gn", "H5G_obj_t" => "Go", - "H5G_stat_t*" => "Gs", - "H5L_type_t" => "Ll", - "unsigned long" => "Lu", + "H5G_stat_t" => "Gs", "hsize_t" => "h", "hssize_t" => "Hs", "hid_t" => "i", - "int" => "Is", - "int32_t" => "Is", - "unsigned" => "Iu", - "unsigned int" => "Iu", - "H5I_type_t" => "It", - "MPI_Comm" => "Mc", + "H5_index_t" => "Ii", + "int" => "In", + "H5_iter_order_t" => "Io", + "int32_t" => "It", + "H5I_type_t" => "Iy", + "H5L_class_t" => "Lc", + "H5L_type_t" => "Ll", + "H5L_index_t" => "Li", + "H5L_iterate_t" => "Lt", + "H5E_minor_t" => "m", + "H5MM_allocate_t" => "Ma", + "MPI_Comm" => "Mc", + "H5MM_free_t" => "Mf", "MPI_Info" => "Mi", "H5FD_mem_t" => "Mt", + "H5_index_t" => "n", "off_t" => "o", + "H5O_info_t" => "Oi", "H5P_class_t" => "p", + "H5P_cls_create_func_t" => "Pa", + "H5P_cls_copy_func_t" => "Pb", + "H5P_cls_close_func_t" => "Pc", + "H5P_iterate_t" => "Pd", + "H5P_prp_create_func_t" => "Pe", + "H5P_prp_copy_func_t" => "Pf", + "H5P_prp_close_func_t" => "Pg", + "H5P_prp_delete_func_t" => "Ph", + "H5P_prp_get_func_t" => "Pi", + "H5P_prp_set_func_t" => "Pj", + "H5_iter_order_t" => "r", "H5R_type_t" => "Rt", - "char*" => "s", + "char" => "s", "H5S_class_t" => "Sc", "H5S_seloper_t" => "Ss", "H5S_sel_type" => "St", "htri_t" => "t", + "H5T_cdata_t" => "Ta", "H5T_cset_t", => "Tc", "H5T_direction_t", => "Td", + "H5T_conv_except_func_t" => "Te", "H5T_norm_t" => "Tn", "H5T_order_t" => "To", "H5T_pad_t" => "Tp", - "H5T_pers_t" => "Te", + "H5T_pers_t" => "Tr", "H5T_sign_t" => "Ts", "H5T_class_t" => "Tt", + "H5T_conv_t" => "Tv", "H5T_str_t" => "Tz", - "void*" => "x", - "void**" => "x", - "FILE*" => "x", - "H5A_operator_t" => "x", - "H5AC_cache_config_t*" => "x", - "H5D_operator_t" => "x", - "H5E_auto_t" => "x", - "H5E_auto_stack_t" => "x", - "H5E_walk_t" => "x", - "H5E_walk_stack_t" => "x", - "H5FD_t*" => "x", - "H5FD_class_t*" => "x", - "H5FD_stream_fapl_t*" => "x", - "H5G_iterate_t" => "x", - "H5L_class_t" => "x", - "H5L_iterate_t" => "x", - "H5MM_allocate_t" => "x", - "H5MM_free_t" => "x", - "H5P_cls_create_func_t" => "x", - "H5P_cls_copy_func_t" => "x", - "H5P_cls_close_func_t" => "x", - "H5P_iterate_t" => "x", - "H5P_prp_create_func_t" => "x", - "H5P_prp_copy_func_t" => "x", - "H5P_prp_close_func_t" => "x", - "H5P_prp_delete_func_t" => "x", - "H5P_prp_get_func_t" => "x", - "H5P_prp_set_func_t" => "x", - "H5T_cdata_t**" => "x", - "H5T_conv_t" => "x", - "H5T_conv_except_func_t" => "x", - "H5Z_func_t" => "x", - "H5Z_filter_func_t" => "x", + "unsigned" => "u", + "unsigned int" => "Ui", + "void" => "v", "size_t" => "z", "H5Z_SO_scale_type_t" => "Za", - "H5Z_class_t*" => "Zc", + "H5Z_class_t" => "Zc", "H5Z_EDC_t" => "Ze", + "H5Z_filter_func_t" => "Zi", "H5Z_filter_t" => "Zf", "ssize_t" => "Zs", + "H5Z_func_t" => "Zu", ); ############################################################################## @@ -248,9 +255,9 @@ sub rewrite_func ($$$$$) { # The H5TRACE() statement if ($body =~ /\/\*[ \t]*NO[ \t]*TRACE[ \t]*\*\//) { if ($body =~ /\s*H5TRACE\d+\s*\(/) { - errmesg $file, $name, "warning: trace info was not updated"; + errmesg $file, $name, "warning: trace info was not updated because of NO TRACE comment"; } else { - errmesg $file, $name, "warning: trace info was not inserted"; + errmesg $file, $name, "warning: trace info was not inserted because of NO TRACE comment"; } } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) { # Replaced an H5TRACE macro -- cgit v0.12