diff --git a/src/common/slurm_acct_gather_profile.c b/src/common/slurm_acct_gather_profile.c index 5ed37f67a3a99a5a877b3030030bb4acba918257..dc51887c51d195ba224fe3f9e94e4fc0a865c891 100644 --- a/src/common/slurm_acct_gather_profile.c +++ b/src/common/slurm_acct_gather_profile.c @@ -363,13 +363,6 @@ extern char *acct_gather_profile_dataset_str( while (dataset && (dataset->type != PROFILE_FIELD_NOT_SET)) { switch (dataset->type) { - case PROFILE_FIELD_TOD: - cur_loc += snprintf(str+cur_loc, str_len-cur_loc, - "%s%s=%s", - cur_loc ? " " : "", - dataset->name, (char *)data); - data += TOD_LEN; - break; case PROFILE_FIELD_UINT64: cur_loc += snprintf(str+cur_loc, str_len-cur_loc, "%s%s=%"PRIu64, diff --git a/src/common/slurm_acct_gather_profile.h b/src/common/slurm_acct_gather_profile.h index 3fcc4813b979e1bb4c283d88c3f2918b4bce93c4..b5defd222a185137a94b605c69f6e5df72514a79 100644 --- a/src/common/slurm_acct_gather_profile.h +++ b/src/common/slurm_acct_gather_profile.h @@ -67,7 +67,6 @@ #include "src/slurmd/slurmstepd/slurmstepd_job.h" #define NO_PARENT -1 -#define TOD_LEN 24 typedef enum { PROFILE_ENERGY, @@ -79,7 +78,6 @@ typedef enum { typedef enum { PROFILE_FIELD_NOT_SET, - PROFILE_FIELD_TOD, PROFILE_FIELD_UINT64, PROFILE_FIELD_DOUBLE } acct_gather_profile_field_type_t; diff --git a/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c b/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c index 6997489944a117892e83c6cb569f5287f74c25a3..ac79fb25b7d7b2aab0d0a14420ee8b5568e940e7 100644 --- a/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c +++ b/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c @@ -100,8 +100,6 @@ const char plugin_name[] = "AcctGatherProfile hdf5 plugin"; const char plugin_type[] = "acct_gather_profile/hdf5"; const uint32_t plugin_version = SLURM_VERSION_NUMBER; -hid_t typTOD; - typedef struct { char *dir; uint32_t def; @@ -500,9 +498,6 @@ extern int acct_gather_profile_p_create_dataset( type_size = sizeof(uint64_t) * 2; /* size for time field */ while (dataset_loc && (dataset_loc->type != PROFILE_FIELD_NOT_SET)) { switch (dataset_loc->type) { - case PROFILE_FIELD_TOD: - type_size += TOD_LEN; - break; case PROFILE_FIELD_UINT64: type_size += sizeof(uint64_t); break; @@ -534,10 +529,6 @@ extern int acct_gather_profile_p_create_dataset( offset = sizeof(uint64_t) * 2; while (dataset_loc && (dataset_loc->type != PROFILE_FIELD_NOT_SET)) { switch (dataset_loc->type) { - case PROFILE_FIELD_TOD: - field_id = typTOD; - field_size = TOD_LEN; - break; case PROFILE_FIELD_UINT64: field_id = H5T_NATIVE_UINT64; field_size = sizeof(uint64_t); diff --git a/src/plugins/acct_gather_profile/hdf5/hdf5_api.c b/src/plugins/acct_gather_profile/hdf5/hdf5_api.c index 99599a833ca6bf2899f739248f3d12142089cc44..0ac565e9a51960dcbca828c718228198217158ad 100644 --- a/src/plugins/acct_gather_profile/hdf5/hdf5_api.c +++ b/src/plugins/acct_gather_profile/hdf5/hdf5_api.c @@ -48,19 +48,13 @@ #include "hdf5_api.h" -static hid_t typTOD; - extern void profile_init(void) { - typTOD = H5Tcopy (H5T_C_S1); - H5Tset_size (typTOD, TOD_LEN); /* create string of length TOD_LEN */ - return; } extern void profile_fini(void) { - H5Tclose(typTOD); H5close(); /* make sure all H5 Objects are closed */ return; diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/hdf5_api.h b/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/hdf5_api.h index 32e84829cbd5edb1b6675ef872ba29efb0dac3c8..721bb189735e5c0f6c146351e0084b797062e2eb 100644 --- a/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/hdf5_api.h +++ b/src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/hdf5_api.h @@ -98,6 +98,7 @@ // Data types supported by all HDF5 plugins of this type +#define TOD_LEN 24 #define TOD_FMT "%F %T" /*